diff options
Diffstat (limited to 'spec/integration/client/ipv6_spec.rb')
-rw-r--r-- | spec/integration/client/ipv6_spec.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/spec/integration/client/ipv6_spec.rb b/spec/integration/client/ipv6_spec.rb index 45086611bc..b6d5b9e0b1 100644 --- a/spec/integration/client/ipv6_spec.rb +++ b/spec/integration/client/ipv6_spec.rb @@ -22,7 +22,7 @@ describe "chef-client" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_zero_opts) { {:host => "::1"} } + let(:chef_zero_opts) { { :host => "::1" } } let(:validation_pem) do <<-END_VALIDATION_PEM @@ -73,7 +73,6 @@ END_CLIENT_RB basic_config_file end - let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") } let(:chef_client_cmd) { %Q{ruby '#{chef_dir}/chef-client' --minimal-ohai -c "#{path_to('config/client.rb')}" -lwarn} } @@ -85,10 +84,9 @@ END_CLIENT_RB # Some Solaris test platforms are too old for IPv6. These tests should not # otherwise be platform dependent, so exclude solaris when_the_chef_server "is running on IPv6", :not_supported_on_solaris, :not_supported_on_gce do - when_the_repository "has a cookbook with a no-op recipe" do before do - cookbook "noop", "1.0.0", { }, "recipes" => {"default.rb" => "#raise 'foo'"} + cookbook "noop", "1.0.0", {}, "recipes" => { "default.rb" => "#raise 'foo'" } file "config/client.rb", client_rb_content file "config/validator.pem", validation_pem end @@ -97,13 +95,11 @@ END_CLIENT_RB result = shell_out("#{chef_client_cmd} -o 'noop::default'", :cwd => chef_dir) result.error! end - end when_the_repository "has a cookbook that hits server APIs" do - before do - recipe=<<-END_RECIPE + recipe = <<-END_RECIPE actual_item = data_bag_item("expect_bag", "expect_item") if actual_item.key?("expect_key") and actual_item["expect_key"] == "expect_value" Chef::Log.info "lookin good" @@ -115,9 +111,9 @@ END_CLIENT_RB END_RECIPE - data_bag("expect_bag", { "expect_item" => {"expect_key" => "expect_value"} }) + data_bag("expect_bag", { "expect_item" => { "expect_key" => "expect_value" } }) - cookbook "api-smoke-test", "1.0.0", { }, "recipes" => {"default.rb" => recipe} + cookbook "api-smoke-test", "1.0.0", {}, "recipes" => { "default.rb" => recipe } end before do @@ -129,7 +125,6 @@ END_CLIENT_RB result = shell_out("#{chef_client_cmd} -o 'api-smoke-test::default'", :cwd => chef_dir) result.error! end - end end end |