Merge pull request #259 from zalando-stups/fix-senza-wait

Fix senza wait for *_IN_PROGRESS

Author: hjacobs

senza/cli.py

@@ -1415,7 +1415,7 @@ def failure_event(event: dict):
               help='Time between checks (default: 5s)')
 @region_option
 @stacktrace_visible_option
-def wait(stack_ref, region, deletion, timeout, interval,):
+def wait(stack_ref, region, deletion, timeout, interval):
     """
     Wait for successful stack creation or deletion.
 
@@ -1426,10 +1426,11 @@ def wait(stack_ref, region, deletion, timeout, interval,):
     region = get_region(region)
     cf = boto3.client('cloudformation', region)
 
-    cutoff = time.time() + timeout
     target_status = (['DELETE_COMPLETE'] if deletion
                      else ['CREATE_COMPLETE', 'UPDATE_COMPLETE'])
 
+    cutoff = time.time() + timeout
+
     while time.time() < cutoff:
         stacks_ok = set()
         stacks_in_progress = set()
@@ -1448,7 +1449,7 @@ def wait(stack_ref, region, deletion, timeout, interval,):
                 stacks_ok.add((stack.name, stack.version))
 
             elif stack.StackStatus.endswith('_IN_PROGRESS'):
-                stacks_in_progress.add(stack.name, stack.version, stack.StackStatus)
+                stacks_in_progress.add((stack.name, stack.version, stack.StackStatus))
 
             else:  # _FAILED or ROLLBACK_COMPLETE or UPDATE_ROLLBACK_COMPLETE
                 # output event messages for troubleshooting

tests/test_cli.py

@@ -1501,3 +1501,60 @@ def my_client(rtype, *args):
                                catch_exceptions=False)
         assert "created" in result.output
         assert "updated" in result.output
+
+
+def test_wait_in_progress(monkeypatch):
+    cf = MagicMock()
+    stack1 = {'StackName': 'test-1',
+              'CreationTime': datetime.datetime.utcnow(),
+              'StackStatus': 'CREATE_IN_PROGRESS'}
+
+    cf.list_stacks.return_value = {'StackSummaries': [stack1]}
+    monkeypatch.setattr('boto3.client', MagicMock(return_value=cf))
+
+    def my_resource(rtype, *args):
+        return MagicMock()
+
+    monkeypatch.setattr('boto3.resource', my_resource)
+    monkeypatch.setattr('time.sleep', MagicMock())
+
+    runner = CliRunner()
+
+    data = {'SenzaInfo': {'StackName': 'test'}}
+
+    with runner.isolated_filesystem():
+        result = runner.invoke(cli,
+                               ['wait', 'test', '1', '--region=aa-fakeregion-1', '--timeout=1'],
+                               catch_exceptions=False)
+        assert "Waiting up to 1 more secs for stack test-1 (CREATE_IN_PROGRESS).." in result.output
+        assert 'Aborted!' in result.output
+        assert 1 == result.exit_code
+
+
+def test_wait_failure(monkeypatch):
+    cf = MagicMock()
+    stack1 = {'StackName': 'test-1',
+              'CreationTime': datetime.datetime.utcnow(),
+              'StackStatus': 'ROLLBACK_COMPLETE'}
+
+    cf.list_stacks.return_value = {'StackSummaries': [stack1]}
+    cf.describe_stack_events.return_value = {'StackEvents': [{'Timestamp': 0, 'ResourceStatus': 'FAIL', 'ResourceStatusReason': 'myreason', 'LogicalResourceId': 'foo'}]}
+    monkeypatch.setattr('boto3.client', MagicMock(return_value=cf))
+
+    def my_resource(rtype, *args):
+        return MagicMock()
+
+    monkeypatch.setattr('boto3.resource', my_resource)
+    monkeypatch.setattr('time.sleep', MagicMock())
+
+    runner = CliRunner()
+
+    data = {'SenzaInfo': {'StackName': 'test'}}
+
+    with runner.isolated_filesystem():
+        result = runner.invoke(cli,
+                               ['wait', 'test', '1', '--region=aa-fakeregion-1'],
+                               catch_exceptions=False)
+        assert 'ERROR: foo FAIL: myreason' in result.output
+        assert 'ERROR: Stack test-1 has status ROLLBACK_COMPLETE' in result.output
+        assert 1 == result.exit_code