Merge branch 'ctrl-c-test' into develop

* ctrl-c-test: Bump up ctrl c timeout to 60 seconds in test
aws · Mar 2, 2015 · 0881cb0 · 0881cb0
2 parents 4b1156f + 3bf96a3
commit 0881cb0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/integration/customizations/s3/test_plugin.py b/tests/integration/customizations/s3/test_plugin.py
@@ -438,10 +438,10 @@ def test_download_ctrl_c_does_not_hang(self):
                       (bucket_name, local_foo_txt), wait_for_finish=False)
         # Give it some time to start up and enter it's main task loop.
         time.sleep(1)
-        # The process has 30 seconds to finish after being sent a Ctrl+C,
+        # The process has 60 seconds to finish after being sent a Ctrl+C,
         # otherwise the test fails.
         process.send_signal(signal.SIGINT)
-        deadline = time.time() + 30
+        deadline = time.time() + 60
         while time.time() < deadline:
             rc = process.poll()
             if rc is not None: