Signed-off-by: Luke Kanies <[EMAIL PROTECTED]>
---
lib/puppet/type/user.rb | 3 +-
test/ral/type/user.rb | 50 -----------------------------------------------
2 files changed, 1 insertions(+), 52 deletions(-)
diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
index 74c4c6a..29f4880 100755
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@ -147,8 +147,7 @@ module Puppet
raise ArgumentError, "Group names must be provided, not
numbers"
end
if value.include?(",")
- puts value
- raise ArgumentError, "Group names must be provided as an
array, not a comma-separated list"
+ raise ArgumentError, "Group names must be provided as an
array, not as a comma-separated list '%s'" % value
end
end
end
diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb
index 87d5b60..4c8a9f9 100755
--- a/test/ral/type/user.rb
+++ b/test/ral/type/user.rb
@@ -164,56 +164,6 @@ class TestUser < Test::Unit::TestCase
assert_equal(old, user.provider.shell, "Shell was not reverted")
end
- def attrtest_gid(user)
- obj = nil
- old = user.provider.gid
- comp = mk_catalog("gidtest", user)
-
- user.retrieve
-
- user[:gid] = old
-
- trans = assert_events([], comp, "user")
-
- newgid = %w{nogroup nobody staff users daemon}.find { |gid|
- begin
- group = Etc.getgrnam(gid)
- rescue ArgumentError => detail
- next
- end
- old != group.gid and group.gid > 0
- }
-
- unless newgid
- $stderr.puts "Cannot find alternate group; skipping gid test"
- return
- end
-
- # first test by name
- assert_nothing_raised("Failed to specify group by name") {
- user[:gid] = newgid
- }
-
- trans = assert_events([:user_changed], comp, "user")
-
- # then by id
- newgid = Etc.getgrnam(newgid).gid
-
- assert_nothing_raised("Failed to specify group by id for %s" % newgid)
{
- user[:gid] = newgid
- }
-
- user.retrieve
-
- assert_events([], comp, "user")
-
- assert_equal(newgid, user.provider.gid, "GID was not changed")
-
- assert_rollback_events(trans, [:user_changed], "user")
-
- assert_equal(old, user.provider.gid, "GID was not reverted")
- end
-
def attrtest_uid(user)
obj = nil
comp = mk_catalog("uidtest", user)
--
1.5.3.7
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
