ariatosca-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From emblempar...@apache.org
Subject [1/2] incubator-ariatosca git commit: ARIA-128 Make test_engine more robust [Forced Update!]
Date Thu, 13 Apr 2017 16:08:35 GMT
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-127-test-operation-failures 9e5883692 -> 8e1d059f9 (forced update)


ARIA-128 Make test_engine more robust


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/3dadc9f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/3dadc9f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/3dadc9f6

Branch: refs/heads/ARIA-127-test-operation-failures
Commit: 3dadc9f648a37119c8eb196e829abf53f2aa5609
Parents: 3a56f12
Author: Tal Liron <tal.liron@gmail.com>
Authored: Tue Apr 11 15:26:43 2017 -0500
Committer: Tal Liron <tal.liron@gmail.com>
Committed: Tue Apr 11 18:21:43 2017 -0500

----------------------------------------------------------------------
 tests/orchestrator/workflows/core/test_engine.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3dadc9f6/tests/orchestrator/workflows/core/test_engine.py
----------------------------------------------------------------------
diff --git a/tests/orchestrator/workflows/core/test_engine.py b/tests/orchestrator/workflows/core/test_engine.py
index 6f97952..0b48870 100644
--- a/tests/orchestrator/workflows/core/test_engine.py
+++ b/tests/orchestrator/workflows/core/test_engine.py
@@ -237,7 +237,8 @@ class TestCancel(BaseTest):
         t.start()
         time.sleep(10)
         eng.cancel_execution()
-        t.join(timeout=30)
+        t.join(timeout=60) # we need to give this a *lot* of time because Travis can be *very*
slow
+        assert not t.is_alive() # if join is timed out it will not raise an exception
         assert workflow_context.states == ['start', 'cancel']
         assert workflow_context.exception is None
         invocations = global_test_holder.get('invocations', [])


Mime
View raw message