summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorIgor Afonov <afonov@gmail.com>2011-11-23 13:18:16 +0200
committerBryan McLellan <btm@opscode.com>2012-03-16 14:15:49 -0700
commit8098ec15ec38491d13b281fc0cea6e2f6230ce1e (patch)
tree1c61eba331552141b31a4b6f6a8c564c2a37e8a9 /features
parentfeb1b2ce80aaafcf8ef4c97a03dd9e0d8ae5b714 (diff)
downloadchef-8098ec15ec38491d13b281fc0cea6e2f6230ce1e.tar.gz
Fixed rollback action for deploy provider. (CHEF-2723, CHEF-1816)
Diffstat (limited to 'features')
-rw-r--r--features/provider/deploy/deploy.feature6
1 files changed, 1 insertions, 5 deletions
diff --git a/features/provider/deploy/deploy.feature b/features/provider/deploy/deploy.feature
index 595accc9cf..66e71668a7 100644
--- a/features/provider/deploy/deploy.feature
+++ b/features/provider/deploy/deploy.feature
@@ -58,9 +58,7 @@ Feature: Deploy
And a file named 'deploy/current/app/before_symlink_was_here.txt' should exist
And a file named 'deploy/current/tmp/restart.txt' should exist
- @chef-1816 @known_issue
- Scenario: Deploy twice and rollback once
- Given I haven't yet fixed CHEF-1816, this test should be pending
+ Scenario: Deploy twice and rollback once using timestamped based deploy
Given a test git repo in the temp directory
And a validated node
And it includes the recipe 'deploy::deploy_commit1'
@@ -78,9 +76,7 @@ Feature: Deploy
Then the run should exit '0'
Then there should be 'one' release
- @chef-2723 @known_issue
Scenario: Make changes, commit them, deploy again using revision based strategy and do rollback
- Given I haven't yet fixed CHEF-1816, this test should be pending
Given a validated node
And it includes the recipe 'deploy::revision_deploy'
And I have a clone of the rails app in the data/tmp dir