You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by em...@apache.org on 2017/04/13 16:08:35 UTC
[1/2] incubator-ariatosca git commit: ARIA-128 Make test_engine more
robust [Forced Update!]
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 <ta...@gmail.com>
Authored: Tue Apr 11 15:26:43 2017 -0500
Committer: Tal Liron <ta...@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', [])
[2/2] incubator-ariatosca git commit: ARIA-127 Make use of in-memory
sqlite more robust
Posted by em...@apache.org.
ARIA-127 Make use of in-memory sqlite 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/8e1d059f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8e1d059f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8e1d059f
Branch: refs/heads/ARIA-127-test-operation-failures
Commit: 8e1d059f9747327b4036b98c1f842d3f05c6c5f0
Parents: 3dadc9f
Author: Tal Liron <ta...@gmail.com>
Authored: Tue Apr 11 18:19:38 2017 -0500
Committer: Tal Liron <ta...@gmail.com>
Committed: Thu Apr 13 10:56:31 2017 -0500
----------------------------------------------------------------------
tests/storage/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8e1d059f/tests/storage/__init__.py
----------------------------------------------------------------------
diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py
index c5d7678..66424db 100644
--- a/tests/storage/__init__.py
+++ b/tests/storage/__init__.py
@@ -51,6 +51,6 @@ def init_inmemory_model_storage():
engine = create_engine(uri, **engine_kwargs)
session_factory = orm.sessionmaker(bind=engine)
- session = session_factory()
+ session = orm.scoped_session(session_factory=session_factory)
return dict(engine=engine, session=session)