[asl-commit] ActiveSambaLdap (trunk) r131:

[null at cozmixng.org]

retro	2007-10-28 11:45:47 +0900 (Sun, 28 Oct 2007)

  New Revision: 131

  Modified files:
    trunk/test/asl-test-utils.rb
    trunk/test/test_asl_useradd.rb
    trunk/test/test_asl_usermod.rb

  Log:


  Modified: trunk/test/asl-test-utils.rb (+3 -3)
===================================================================
--- trunk/test/asl-test-utils.rb	2007-10-28 11:23:50 +09:00 (rev 130)
+++ trunk/test/asl-test-utils.rb	2007-10-28 11:45:47 +09:00 (rev 131)
@@ -114,7 +114,7 @@
       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}"
+        uid_number = config[:uid_number] || (1000000 + @user_index)
         default_user_gid = @user_class.configuration[:default_user_gid]
         gid_number = config[:gid_number] || default_user_gid
         _wrap_assertion do
@@ -152,7 +152,7 @@
       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}"
+        uid_number = config[:uid_number] || (1000000 + @computer_index)
         default_computer_gid =
           @computer_class.configuration[:default_computer_gid]
         gid_number = config[:gid_number] || default_computer_gid
@@ -187,7 +187,7 @@
       @group_index += 1
       name = config[:name] || "test-group#{@group_index}"
       ensure_delete_group(name) do
-        gid_number = config[:gid_number] || "200000#{@group_index}"
+        gid_number = config[:gid_number] || (2000000 + @group_index)
         group_type = config[:group_type] || "domain"
         _wrap_assertion do
           assert(!@group_class.exists?(name))

  Modified: trunk/test/test_asl_usermod.rb (+1 -1)
===================================================================
--- trunk/test/test_asl_usermod.rb	2007-10-28 11:23:50 +09:00 (rev 130)
+++ trunk/test/test_asl_usermod.rb	2007-10-28 11:45:47 +09:00 (rev 131)
@@ -351,7 +351,7 @@
       assert_asl_usermod_successfully(user.uid, password, *args)
 
       new_user = @user_class.find(user.uid)
-      assert_equal(new_expire_date.to_i.to_s, new_user.samba_kickoff_time)
+      assert_equal(new_expire_date.to_i, new_user.samba_kickoff_time)
     end
   end
 

  Modified: trunk/test/test_asl_useradd.rb (+2 -2)
===================================================================
--- trunk/test/test_asl_useradd.rb	2007-10-28 11:23:50 +09:00 (rev 130)
+++ trunk/test/test_asl_useradd.rb	2007-10-28 11:45:47 +09:00 (rev 131)
@@ -149,7 +149,7 @@
             user = @user_class.find(uid)
             primary_group = @group_class.find(:first,
                                               :attribute => "gidNumber",
-                                              :value => user.gid_number)
+                                              :value => user.gid_number.to_s)
             groups = @group_class.find(:all,
                                        :attribute => "memberUid",
                                        :value => uid)
@@ -167,7 +167,7 @@
             computer = @computer_class.find(uid)
             primary_group = @group_class.find(:first,
                                               :attribute => "gidNumber",
-                                              :value => computer.gid_number)
+                                              :value => computer.gid_number.to_s)
             groups = @group_class.find(:all,
                                        :attribute => "memberUid",
                                        :value => uid)