Merge pull request #6138 from chef/tm/acceptance

Acceptance test fixes

11 files changed, 20 insertions, 159 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 166494703a..1697c04c8b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.2)
+    activesupport (5.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -140,7 +140,7 @@ GEM
       net-ssh
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     diff-lcs (1.3)
     docile (1.1.5)
     docker-api (1.33.4)
@@ -180,7 +180,7 @@ GEM
     httpclient (2.8.3)
     i18n (0.8.1)
     iniparse (1.4.2)
-    inspec (1.21.0)
+    inspec (1.23.0)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -209,7 +209,7 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
-    minitest (5.10.1)
+    minitest (5.10.2)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -257,12 +257,12 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parallel (1.11.1)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    plist (3.2.0)
+    plist (3.3.0)
     powerpack (0.1.1)
     proxifier (1.0.3)
     pry (0.10.4)
@@ -281,28 +281,28 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (2.0.1)
+    rack (2.0.2)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
     rb-readline (0.5.4)
     retriable (3.0.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -332,7 +332,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.67.8)
+    specinfra (2.67.9)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -389,7 +389,7 @@ GEM
       ffi-win32-extensions
     windows-api (0.4.4)
       win32-api (>= 1.4.5)
-    winrm (2.2.2)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore b/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore
deleted file mode 100644
index 041413b040..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-nodes/
-tmp/
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb b/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb
deleted file mode 100644
index 6c754560f0..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-name "acceptance-cookbook"
-depends "kitchen_acceptance"
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb b/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb
deleted file mode 100644
index e2d663ac2f..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb
+++ /dev/null
@@ -1 +0,0 @@
-kitchen "destroy"
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb b/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb
deleted file mode 100644
index 5726c0e7b5..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb
+++ /dev/null
@@ -1 +0,0 @@
-kitchen "converge"
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb b/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb
deleted file mode 100644
index 05ac94ce66..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb
+++ /dev/null
@@ -1 +0,0 @@
-kitchen "verify"
diff --git a/acceptance/fips/.kitchen.yml b/acceptance/fips/.kitchen.yml
deleted file mode 100644
index e78a3289d1..0000000000
--- a/acceptance/fips/.kitchen.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-suites:
-  - name: fips-unit-functional
-    includes: [centos-6]
-    run_list:
-
-  - name: fips-integration
-    includes: [centos-6, windows-2012r2]
-    run_list:
diff --git a/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile b/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile
deleted file mode 100644
index d297c4314d..0000000000
--- a/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-# Until https://github.com/test-kitchen/busser-serverspec/pull/42 is merged and
-# released, we need to include rake and rspec-core in the Gemfile
-gem "rake"
-gem "rspec-core"
-gem "busser-serverspec"
-gem "serverspec"
-gem "mixlib-shellout"
diff --git a/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb b/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb
deleted file mode 100644
index 2a087f8029..0000000000
--- a/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require "mixlib/shellout"
-require "bundler"
-
-describe "Chef Fips Integration Specs" do
-  def windows?
-    if RUBY_PLATFORM =~ /mswin|mingw|windows/
-      true
-    else
-      false
-    end
-  end
-
-  let(:omnibus_root) do
-    if windows?
-      "c:/opscode/chef"
-    else
-      "/opt/chef"
-    end
-  end
-
-  let(:env) do
-    {
-      "PATH" => [ "#{omnibus_root}/embedded/bin", ENV["PATH"] ].join(File::PATH_SEPARATOR),
-      "BUNDLE_GEMFILE" => "#{omnibus_root}/Gemfile",
-      "GEM_PATH" => nil, "GEM_CACHE" => nil, "GEM_HOME" => nil,
-      "BUNDLE_IGNORE_CONFIG" => "true",
-      "BUNDLE_FROZEN" => "1",
-      "CHEF_FIPS" => "1"
-    }
-  end
-
-  let(:chef_dir) do
-    cmd = Mixlib::ShellOut.new("bundle show chef", env: env).run_command
-    cmd.error!
-    cmd.stdout.chomp
-  end
-
-  def run_rspec_test(test)
-    Bundler.with_clean_env do
-      cmd = Mixlib::ShellOut.new(
-        "bundle exec rspec -f documentation -t ~requires_git #{test}",
-        env: env, cwd: chef_dir, timeout: 3600
-      )
-      cmd.run_command.error!
-    end
-  end
-
-  it "passes the integration specs" do
-    skip
-    #run_rspec_test("spec/integration")
-  end
-end
diff --git a/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile b/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile
deleted file mode 100644
index 03c7a9e657..0000000000
--- a/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-# Until https://github.com/test-kitchen/busser-serverspec/pull/42 is merged and
-# released, we need to include rake and rspec-core in the Gemfile
-gem "rake"
-gem "rspec-core"
-gem "mixlib-shellout"
diff --git a/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb b/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb
deleted file mode 100644
index 446261f83f..0000000000
--- a/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require "mixlib/shellout"
-require "bundler"
-
-describe "Chef Fips Unit/Functional Specs" do
-  def windows?
-    if RUBY_PLATFORM =~ /mswin|mingw|windows/
-      true
-    else
-      false
-    end
-  end
-
-  let(:omnibus_root) do
-    if windows?
-      "c:/opscode/chef"
-    else
-      "/opt/chef"
-    end
-  end
-
-  let(:env) do
-    {
-      "PATH" => [ "#{omnibus_root}/embedded/bin", ENV["PATH"] ].join(File::PATH_SEPARATOR),
-      "BUNDLE_GEMFILE" => "#{omnibus_root}/Gemfile",
-      "GEM_PATH" => nil, "GEM_CACHE" => nil, "GEM_HOME" => nil,
-      "BUNDLE_IGNORE_CONFIG" => "true",
-      "BUNDLE_FROZEN" => "1",
-      "CHEF_FIPS" => "1"
-    }
-  end
-
-  let(:chef_dir) do
-    cmd = Mixlib::ShellOut.new("bundle show chef", env: env).run_command
-    cmd.error!
-    cmd.stdout.chomp
-  end
-
-  def run_rspec_test(test)
-    Bundler.with_clean_env do
-      cmd = Mixlib::ShellOut.new(
-        "bundle exec rspec -f documentation -t ~requires_git #{test}",
-        env: env, cwd: chef_dir, timeout: 3600
-      )
-      cmd.run_command.error!
-    end
-  end
-
-  it "passes the unit specs" do
-    run_rspec_test("spec/unit")
-  end
-
-  it "passes the functional specs" do
-    run_rspec_test("spec/functional")
-  end
-
-end