diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-02-19 16:00:08 -0800 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2016-02-19 16:00:08 -0800 |
| commit | 9fb6d90844b48d18dcda10e9b75e3578d85bd75b (patch) | |
| tree | b5c43dad4c28440a81db024b2c722556d1ae1487 | |
| parent | 91918b3db2c1985b9368084a4d82de4ac6854473 (diff) | |
| parent | 82a6fdef60c662bc99476d88ee93bb1531e5cc6d (diff) | |
| download | chef-9fb6d90844b48d18dcda10e9b75e3578d85bd75b.tar.gz | |
Merge pull request #4606 from chef/salam/acceptance-fix
Fix acceptance test nil warnings, make inspec tests work
| -rw-r--r-- | acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb | 6 | ||||
| -rw-r--r-- | acceptance/Gemfile | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb b/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb index d3913ebb11..916ca5ca7a 100644 --- a/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +++ b/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb @@ -4,7 +4,7 @@ module KitchenAcceptance property :command, String, name_property: true property :driver, %w(ec2 vagrant), coerce: proc { |v| v.to_s }, default: lazy { ENV["KITCHEN_DRIVER"] || :ec2 } - property :instances, String, default: lazy { ENV["KITCHEN_INSTANCES"] } + property :instances, String, default: lazy { ENV["KITCHEN_INSTANCES"] ? ENV["KITCHEN_INSTANCES"] : "" } property :kitchen_dir, String, default: Chef.node['chef-acceptance']['suite-dir'] property :chef_product, String, default: lazy { ENV["KITCHEN_CHEF_PRODUCT"] || @@ -22,8 +22,8 @@ module KitchenAcceptance (ENV["PROJECT_NAME"] == chef_product ? ENV["OMNIBUS_BUILD_VERSION"] : nil) || "latest" } - property :artifactory_username, String, default: lazy { ENV["ARTIFACTORY_USERNAME"] } - property :artifactory_password, String, default: lazy { ENV["ARTIFACTORY_PASSWORD"] } + property :artifactory_username, String, default: lazy { ENV["ARTIFACTORY_USERNAME"] ? ENV["ARTIFACTORY_USERNAME"] : "" } + property :artifactory_password, String, default: lazy { ENV["ARTIFACTORY_PASSWORD"] ? ENV["ARTIFACTORY_PASSWORD"] : "" } property :env, Hash, default: {} property :kitchen_options, String, default: lazy { ENV["PROJECT_NAME"] ? "-c -l debug" : "-c" } diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 753b2117a4..b16cc2e155 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -4,7 +4,8 @@ gem "mixlib-install", github: "chef/mixlib-install" gem "chef-acceptance", github: "chef/chef-acceptance" gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-install-update" gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2", branch: "jk/image-search-only" -gem "kitchen-inspec" +gem "kitchen-inspec", "= 0.11.0" +gem "inspec", "= 0.11.0" gem "kitchen-vagrant" gem "windows_chef_zero" gem "winrm-transport" |