diff options
| author | Salim Alam <salam@chef.io> | 2016-02-08 19:42:03 -0800 |
|---|---|---|
| committer | Salim Alam <salam@chef.io> | 2016-02-08 19:42:03 -0800 |
| commit | 09d1cbfb091094c6d5e0d9b5c715c1555ac21f83 (patch) | |
| tree | 244c6c24974657a71dd3e0297dc2525a20e2536f | |
| parent | c6e69783705cfd48bfea0c943dc071964dd21311 (diff) | |
| parent | 9c5e9f361c3ad5b648363cf4452ecd06551e0674 (diff) | |
| download | chef-09d1cbfb091094c6d5e0d9b5c715c1555ac21f83.tar.gz | |
Merge pull request #4538 from chef/salam/acceptance-update
Expand the list of acceptance tests
| -rw-r--r-- | acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb | 2 | ||||
| -rwxr-xr-x | ci/verify-chef.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb b/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb index f125d70953..05c1331744 100644 --- a/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb +++ b/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb @@ -1,5 +1,5 @@ chef_version = ENV["KITCHEN_CHEF_VERSION"].split("+")[0] describe command("chef-client -v") do its("exit_status") { should eq 0 } - its(:stdout) { should match /Chef: #{chef_version}/ } + its(:stdout) { should match /Chef: #{chef_version}/ } if chef_version != "latest" end diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh index 074a110134..0c8ca768f7 100755 --- a/ci/verify-chef.sh +++ b/ci/verify-chef.sh @@ -86,7 +86,7 @@ if [ "x$ACCEPTANCE" != "x" ]; then # Test against the vendored Chef gem cd /opt/$PROJECT_NAME/embedded/lib/ruby/gems/*/gems/chef-[0-9]*/acceptance sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD bundle install - sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD KITCHEN_DRIVER=ec2 bundle exec chef-acceptance test cookbook-git + sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD KITCHEN_DRIVER=ec2 bundle exec chef-acceptance test else PATH=/opt/$PROJECT_NAME/bin:/opt/$PROJECT_NAME/embedded/bin:$PATH export PATH |