diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2014-08-18 09:33:54 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-08-18 09:33:54 -0700 |
| commit | 281fc5a3a120c2fca42ffe7f8d273debdf530cfe (patch) | |
| tree | 9f152c8f076824ff3d4aa436bfd6ccf3baab99c8 | |
| parent | 08b3eaed965f17fbf9bee217beeacfe7449d162a (diff) | |
| parent | 96797f8238c3bb86b2ce2e4218cf61316337b91c (diff) | |
| download | chef-281fc5a3a120c2fca42ffe7f8d273debdf530cfe.tar.gz | |
Merge pull request #1847 from ClogenyTechnologies/kd/fixuserspec
revert change for ubuntu and fix test user spec tests
| -rw-r--r-- | spec/functional/resource/user/useradd_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/functional/resource/user/useradd_spec.rb b/spec/functional/resource/user/useradd_spec.rb index 997276fc3c..1fbe6fcb4d 100644 --- a/spec/functional/resource/user/useradd_spec.rb +++ b/spec/functional/resource/user/useradd_spec.rb @@ -647,10 +647,11 @@ describe Chef::Provider::User::Useradd, metadata do @error.should be_nil if ohai[:platform] == "aix" pw_entry.passwd.should == '*' + user_account_should_be_unlocked else pw_entry.passwd.should == 'x' + shadow_password.should include("!") end - user_account_should_be_unlocked end end end |