diff options
| author | Adam Jacob <adam@opscode.com> | 2009-10-25 15:46:33 -0700 |
|---|---|---|
| committer | Adam Jacob <adam@opscode.com> | 2009-10-25 15:46:33 -0700 |
| commit | 4a0e98db3b60b000006407eaba8334b4260d7af0 (patch) | |
| tree | 1f37272a7c5957e59f3f677131161125567ae65e /features | |
| parent | 50969631ba9b413ebb7ac5877529c1b8b7e97001 (diff) | |
| download | chef-4a0e98db3b60b000006407eaba8334b4260d7af0.tar.gz | |
Fixes CHEF-638, deploy w/revision rolls back
Deploy with a revision now rolls back to that revision
Actions in the deploy resource set @new_resource.updated
Rollback to a specific revision now works as expected
Diffstat (limited to 'features')
| -rw-r--r-- | features/provider/deploy/deploy.feature | 2 | ||||
| -rw-r--r-- | features/steps/deploy_steps.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/features/provider/deploy/deploy.feature b/features/provider/deploy/deploy.feature index 25c13db799..45d46d5861 100644 --- a/features/provider/deploy/deploy.feature +++ b/features/provider/deploy/deploy.feature @@ -1,4 +1,4 @@ -@provider @git @deploy +@provider @git @deploy @provider_deploy Feature: Deploy In order to repeatably and reliably deploy web apps from a source repository from the comfort of chef diff --git a/features/steps/deploy_steps.rb b/features/steps/deploy_steps.rb index 7b9e95a3f2..7c2c741b91 100644 --- a/features/steps/deploy_steps.rb +++ b/features/steps/deploy_steps.rb @@ -54,6 +54,6 @@ end Then /^the second chef run should have skipped deployment$/ do expected_deploy = "#{tmpdir}/deploy/releases/62c9979f6694612d9659259f8a68d71048ae9a5b" - Then "'stdout' should have 'INFO: Already deployed app at #{expected_deploy}, skipping. Use action :force_deploy to force.'" + Then "'stdout' should not have 'INFO: Already deployed app at #{expected_deploy}. Rolling back to it - use action :force_deploy to re-checkout this revision.'" end |