diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-25 09:14:55 -0800 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-25 16:09:51 -0800 |
commit | f2e5940e69f46e2e081d68e2f9ff837671902f5f (patch) | |
tree | a338f0f8e5247bc5445614b47f7d7daf756bdd7a | |
parent | 3b82bb9f89c0f95d4ba94591e9ac9e769477eb64 (diff) | |
download | chef-f2e5940e69f46e2e081d68e2f9ff837671902f5f.tar.gz |
Exclude git from the fips acceptance tests
We don't have git on those boxes
-rw-r--r-- | acceptance/fips/test/integration/fips/serverspec/fips_spec.rb | 2 | ||||
-rw-r--r-- | spec/functional/resource/deploy_revision_spec.rb | 2 | ||||
-rw-r--r-- | spec/functional/resource/git_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb b/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb index 89a10dcf68..3076c68f67 100644 --- a/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb +++ b/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb @@ -29,7 +29,7 @@ describe "Chef Fips Specs" do it "passes the unit and functional specs" do Bundler.with_clean_env do ruby_cmd = Mixlib::ShellOut.new( - "bundle exec rspec spec/unit spec/functional", :env => { "PATH" => "#{ENV['PATH']}:#{path}", + "bundle exec rspec -t ~requires_git spec/unit spec/functional", :env => { "PATH" => "#{ENV['PATH']}:#{path}", "GEM_PATH" => nil, "GEM_CACHE" => nil, "GEM_HOME" => nil, "CHEF_FIPS" => "1" }, :live_stream => STDOUT, :cwd => chef_dir) diff --git a/spec/functional/resource/deploy_revision_spec.rb b/spec/functional/resource/deploy_revision_spec.rb index ee98832180..72eaea3c12 100644 --- a/spec/functional/resource/deploy_revision_spec.rb +++ b/spec/functional/resource/deploy_revision_spec.rb @@ -20,7 +20,7 @@ require "spec_helper" require "tmpdir" # Deploy relies heavily on symlinks, so it doesn't work on windows. -describe Chef::Resource::DeployRevision, :unix_only => true do +describe Chef::Resource::DeployRevision, :unix_only => true, :requires_git => true do let(:file_cache_path) { Dir.mktmpdir } let(:deploy_directory) { Dir.mktmpdir } diff --git a/spec/functional/resource/git_spec.rb b/spec/functional/resource/git_spec.rb index 92c2dd2074..11a3afdee5 100644 --- a/spec/functional/resource/git_spec.rb +++ b/spec/functional/resource/git_spec.rb @@ -22,7 +22,7 @@ require "tmpdir" require "shellwords" # Deploy relies heavily on symlinks, so it doesn't work on windows. -describe Chef::Resource::Git do +describe Chef::Resource::Git, :requires_git => true do include Chef::Mixin::ShellOut let(:file_cache_path) { Dir.mktmpdir } # Some versions of git complains when the deploy directory is |