[asl-commit] ActiveSambaLdap r9:
null at cozmixng.org
null at cozmixng.org
Fri Aug 3 22:31:22 EDT 2007
retro 2007-08-04 11:31:19 +0900 (Sat, 04 Aug 2007)
New Revision: 9
Copied files:
trunk/test/asl-test-utils.rb
(from rev 8, trunk/test/asl_test_utils.rb)
Removed files:
trunk/test/asl_test_utils.rb
Modified files:
trunk/test/test_asl_groupadd.rb
trunk/test/test_asl_groupdel.rb
trunk/test/test_asl_groupmod.rb
trunk/test/test_asl_groupshow.rb
trunk/test/test_asl_passwd.rb
trunk/test/test_asl_populate.rb
trunk/test/test_asl_useradd.rb
trunk/test/test_asl_userdel.rb
trunk/test/test_asl_usermod.rb
trunk/test/test_asl_usershow.rb
Log:
Modified: trunk/test/test_asl_groupshow.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_groupshow.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_groupshow.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslGroupShowTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_groupmod.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_groupmod.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_groupmod.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslGroupModTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_groupadd.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_groupadd.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_groupadd.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslGroupAddTest < Test::Unit::TestCase
include AslTestUtils
Deleted: trunk/test/asl_test_utils.rb (+0 -253)
===================================================================
--- trunk/test/asl_test_utils.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/asl_test_utils.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,253 +0,0 @@
-require 'test/unit'
-require 'test-unit-ext'
-
-require 'rbconfig'
-require 'fileutils'
-require 'tmpdir'
-
-require File.join(File.dirname(__FILE__), "command")
-
-require 'active_samba_ldap'
-
-module AslTestUtils
- def self.included(base)
- base.class_eval do
- include Config
- include Connection
- include Populate
- include TemporaryEntry
- include CommandSupport
- end
- end
-
- module Config
- def setup
- super
- @test_dir = File.expand_path(File.dirname(__FILE__))
- @top_dir = File.expand_path(File.join(@test_dir, ".."))
- @parent_dir = File.expand_path(File.join(@top_dir, ".."))
- @config_file = File.join(@test_dir, "activesambaldap.conf")
- ActiveSambaLdap::DefaultConfig::FILES << @config_file
- end
-
- def teardown
- super
- ActiveSambaLdap::DefaultConfig::FILES.reject! {|x| x == @config_file}
- end
- end
-
- module Connection
- def setup
- super
- ActiveSambaLdap::Base.establish_connection({}, false)
- end
-
- def teardown
- super
- ActiveLdap::Base.clear_active_connections!
- end
- end
-
- module Populate
- def setup
- super
- @dumped_data = ""
- begin
- @dumped_data = ActiveSambaLdap::Base.dump(:scope => :sub)
- rescue ActiveLdap::ConnectionError
- end
- ActiveSambaLdap::Base.delete_all(nil, :scope => :sub)
- ActiveSambaLdap::Base.populate
- end
-
- def teardown
- super
- ActiveSambaLdap::Base.establish_connection({}, false)
- ActiveSambaLdap::Base.delete_all(nil, :scope => :sub)
- ActiveSambaLdap::Base.load(@dumped_data)
- end
- end
-
- module TemporaryEntry
- def setup
- super
- @user_class = Class.new(ActiveSambaLdap::User)
- @user_class.ldap_mapping
- @computer_class = Class.new(ActiveSambaLdap::Computer)
- @computer_class.ldap_mapping
- @group_class = Class.new(ActiveSambaLdap::Group)
- @group_class.ldap_mapping
-
- @user_class.set_associated_class(:primary_group, @group_class)
- @computer_class.set_associated_class(:primary_group, @group_class)
- @user_class.set_associated_class(:groups, @group_class)
- @computer_class.set_associated_class(:groups, @group_class)
-
- @group_class.set_associated_class(:users, @user_class)
- @group_class.set_associated_class(:computers, @computer_class)
- @group_class.set_associated_class(:primary_users, @user_class)
- @group_class.set_associated_class(:primary_computers, @computer_class)
-
- @user_index = 0
- @computer_index = 0
- @group_index = 0
- end
-
- def make_dummy_user(config={})
- @user_index += 1
- name = config[:name] || "test-user#{@user_index}"
- home_directory = config[:home_directory] || "/tmp/#{name}-#{Process.pid}"
- ensure_delete_user(name, home_directory) do
- password = config[:password] || "password"
- uid_number = config[:uid_number] || "100000#{@user_index}"
- default_user_gid = ActiveSambaLdap::Config.default_user_gid
- gid_number = config[:gid_number] || default_user_gid
- _wrap_assertion do
- assert(!@user_class.exists?(name))
- user = @user_class.new(name)
- user.init(uid_number, @group_class.find_by_gid_number(gid_number))
- user.home_directory = home_directory
- user.change_password(password)
- user.change_samba_password(password)
- user.save!
- FileUtils.mkdir(home_directory)
- assert(@user_class.exists?(name))
- yield(user, password)
- end
- end
- end
-
- def ensure_delete_user(uid, home=nil)
- yield(uid, home)
- ensure
- FileUtils.rm_rf(home) if home
- if @user_class.exists?(uid)
- user = @user_class.find(uid)
- user.groups = []
- user.destroy
- end
- end
-
- def make_dummy_computer(config={})
- @computer_index += 1
- name = config[:name] || "test-computer#{@computer_index}$"
- home_directory = config[:home_directory] || "/tmp/#{name}-#{Process.pid}"
- ensure_delete_computer(name, home_directory) do |name, home_directory|
- password = config[:password]
- uid_number = config[:uid_number] || "100000#{@computer_index}"
- default_computer_gid = ActiveSambaLdap::Config.default_computer_gid
- gid_number = config[:gid_number] || default_computer_gid
- _wrap_assertion do
- assert(!@computer_class.exists?(name))
- computer = @computer_class.new(name)
- computer.init(uid_number, @group_class.find_by_gid_number(gid_number))
- if password
- computer.change_password(password)
- computer.change_samba_password(password)
- end
- computer.save!
- FileUtils.mkdir(home_directory)
- assert(@computer_class.exists?(name))
- yield(computer, password)
- end
- end
- end
-
- def ensure_delete_computer(uid, home=nil)
- yield(uid.sub(/\$+\z/, '') + "$", home)
- ensure
- FileUtils.rm_rf(home) if home
- if @computer_class.exists?(uid)
- computer = @computer_class.find(uid)
- computer.groups = []
- computer.destroy
- end
- end
-
- def make_dummy_group(config={})
- @group_index += 1
- name = config[:name] || "test-group#{@group_index}"
- ensure_delete_group(name) do
- gid_number = config[:gid_number] || "200000#{@group_index}"
- group_type = config[:group_type] || "domain"
- _wrap_assertion do
- assert(!@group_class.exists?(name))
- group = @group_class.new(name)
- group.change_gid_number(gid_number)
- group.change_type(group_type)
- group.save!
- assert(@group_class.exists?(name))
- yield(group)
- end
- end
- end
-
- def ensure_delete_group(name)
- yield(name)
- ensure
- @group_class.destroy(name) if @group_class.exists?(name)
- end
-
- def ensure_delete_ou(ou)
- yield(ou)
- ensure
- ou_class = Class.new(ActiveSambaLdap::Ou)
- ou_class.ldap_mapping
- ou_class.destroy(ou) if ou_class.exists?(ou)
- end
-
- def pool
- pool_class = Class.new(ActiveSambaLdap::UnixIdPool)
- pool_class.ldap_mapping
- ActiveSambaLdap::Config.required_variables :samba_domain
- pool_class.new(ActiveSambaLdap::Config.samba_domain)
- end
-
- def next_uid_number
- pool.uidNumber || @user_class.start_uid
- end
-
- def next_gid_number
- pool.gidNumber || @group_class.start_gid
- end
- end
-
- module CommandSupport
- def setup
- super
- @fakeroot = "fakeroot"
- @ruby = File.join(::Config::CONFIG["bindir"],
- ::Config::CONFIG["RUBY_INSTALL_NAME"])
- @bin_dir = File.join(@top_dir, "bin")
- @lib_dir = File.join(@top_dir, "lib")
- @ruby_args = [
- "-I", @lib_dir,
- "-I", File.join(@parent_dir, "activeldap", "lib"),
-# "-I", File.join(@parent_dir, "ldap", "lib"),
-# "-I", File.join(@parent_dir, "ldap"),
- ]
- end
-
- def run_command_as_normal_user(*args, &block)
- run_ruby(*[@command, "--config", @config_file, *args], &block)
- end
-
- def run_command_with_fakeroot(*args, &block)
- run_ruby_with_fakeroot(*[@command, "--config", @config_file, *args],
- &block)
- end
- alias_method :run_command, :run_command_with_fakeroot
-
- def run_ruby(*ruby_args, &block)
- args = [@ruby, *@ruby_args]
- args.concat(ruby_args)
- Command.run(*args, &block)
- end
-
- def run_ruby_with_fakeroot(*ruby_args, &block)
- args = [@fakeroot, @ruby, *@ruby_args]
- args.concat(ruby_args)
- Command.run(*args, &block)
- end
- end
-end
Copied: trunk/test/asl-test-utils.rb (+0 -0)
===================================================================
Modified: trunk/test/test_asl_groupdel.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_groupdel.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_groupdel.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslGroupDelTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_usermod.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_usermod.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_usermod.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslUserModTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_useradd.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_useradd.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_useradd.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslUserAddTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_userdel.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_userdel.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_userdel.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslUserDelTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_populate.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_populate.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_populate.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslPopulateTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_passwd.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_passwd.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_passwd.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslPasswdTest < Test::Unit::TestCase
include AslTestUtils
Modified: trunk/test/test_asl_usershow.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_usershow.rb 2006-11-12 20:50:28 +09:00 (rev 8)
+++ trunk/test/test_asl_usershow.rb 2007-08-04 11:31:19 +09:00 (rev 9)
@@ -1,4 +1,4 @@
-require 'asl_test_utils'
+require 'asl-test-utils'
class AslUserShowTest < Test::Unit::TestCase
include AslTestUtils
More information about the asl-commit
mailing list