Merge pull request #4444 from chef/tball/nexus7_test_failures

Test failures for the Cisco Nexus 7 & Solaris platform in Manhattan

4 files changed, 14 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index 0c9a7314b6..2c37e6c7d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,8 +32,6 @@ group(:development, :test) do
 
   gem "ruby-shadow", platforms: :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
 
-  gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git", ref: "4e32fca"
-
   # For external tests
   #  gem 'chef-zero', github: 'chef/chef-zero'
   #  gem 'cheffish', github: 'chef/cheffish'
@@ -48,6 +46,11 @@ group(:development, :test) do
   #  gem 'chef-rewind'
 end
 
+group(:travis) do
+  # See `bundler-audit` in .travis.yml
+  gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git", ref: "4e32fca"
+end
+
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 93b0a2016b..9b6757287e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: e9675680662c8420b980d2d6067a93212d898f67
+  revision: 5c7ad9dbcbf11aaa6326446ab4128ec23685c33d
   specs:
     omnibus-software (4.0.0)
 
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index 418dad431d..846bd2ba44 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -361,7 +361,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" }
   end
 
   describe "group modify action", :not_supported_on_solaris do
-    let(:spec_members){ ["Gordon", "Eric", "Anthony"] }
+    let(:spec_members){ ["mnou5sdz", "htulrvwq", "x4c3g1lu"] }
     let(:included_members) { [spec_members[0], spec_members[1]] }
     let(:excluded_members) { [spec_members[2]] }
     let(:tested_action) { :modify }
@@ -389,7 +389,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" }
   end
 
   describe "group manage action", :not_supported_on_solaris do
-    let(:spec_members){ ["Gordon", "Eric", "Anthony"] }
+    let(:spec_members){ ["mnou5sdz", "htulrvwq", "x4c3g1lu"] }
     let(:included_members) { [spec_members[0], spec_members[1]] }
     let(:excluded_members) { [spec_members[2]] }
     let(:tested_action) { :manage }
@@ -427,7 +427,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" }
 
   describe "group resource with Usermod provider", :solaris_only do
     describe "when excluded_members is set" do
-      let(:excluded_members) { ["Anthony"] }
+      let(:excluded_members) { ["x4c3g1lu"] }
 
       it ":manage should raise an error" do
         expect {group_resource.run_action(:manage) }.to raise_error
@@ -443,7 +443,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" }
     end
 
     describe "when append is not set" do
-      let(:included_members) { ["Gordon", "Eric"] }
+      let(:included_members) { ["gordon", "eric"] }
 
       before(:each) do
         group_resource.append(false)
diff --git a/spec/functional/resource/user/useradd_spec.rb b/spec/functional/resource/user/useradd_spec.rb
index 9335aa8505..38682baea6 100644
--- a/spec/functional/resource/user/useradd_spec.rb
+++ b/spec/functional/resource/user/useradd_spec.rb
@@ -242,17 +242,17 @@ describe Chef::Provider::User::Useradd, metadata do
         let(:home) { "/home/#{username}" }
 
         it "ensures the user's home is set to the given path" do
-          expect(pw_entry.home).to eq("/home/#{username}")
+          expect(pw_entry.home).to eq(home)
         end
 
         if %w{rhel fedora}.include?(OHAI_SYSTEM["platform_family"])
           # Inconsistent behavior. See: CHEF-2205
           it "creates the home dir when not explicitly asked to on RHEL (XXX)" do
-            expect(File).to exist("/home/#{username}")
+            expect(File).to exist(home)
           end
         else
           it "does not create the home dir without `manage_home'" do
-            expect(File).not_to exist("/home/#{username}")
+            expect(File).not_to exist(home)
           end
         end
 
@@ -260,7 +260,7 @@ describe Chef::Provider::User::Useradd, metadata do
           let(:manage_home) { true }
 
           it "ensures the user's home directory exists" do
-            expect(File).to exist("/home/#{username}")
+            expect(File).to exist(home)
           end
         end
       end