You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by mx...@apache.org on 2017/06/15 18:35:17 UTC
incubator-ariatosca git commit: optimization 2
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-278-Remove-core-tasks f198fc05e -> aa6f801de
optimization 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/aa6f801d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/aa6f801d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/aa6f801d
Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: aa6f801dec13e40a21aad80138974e9857cb12e0
Parents: f198fc0
Author: max-orlov <ma...@gigaspaces.com>
Authored: Thu Jun 15 21:35:12 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Thu Jun 15 21:35:12 2017 +0300
----------------------------------------------------------------------
aria/orchestrator/context/operation.py | 1 -
aria/orchestrator/context/workflow.py | 1 -
tests/orchestrator/workflows/executor/test_process_executor.py | 6 +++++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/aa6f801d/aria/orchestrator/context/operation.py
----------------------------------------------------------------------
diff --git a/aria/orchestrator/context/operation.py b/aria/orchestrator/context/operation.py
index 2e897b5..07bf297 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -110,7 +110,6 @@ class BaseOperationContext(common.BaseContext):
@property
@contextmanager
def track_changes(self):
- self.model.task.update(self.task)
yield
self.model.task.update(self.task)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/aa6f801d/aria/orchestrator/context/workflow.py
----------------------------------------------------------------------
diff --git a/aria/orchestrator/context/workflow.py b/aria/orchestrator/context/workflow.py
index ce7a892..4b7573f 100644
--- a/aria/orchestrator/context/workflow.py
+++ b/aria/orchestrator/context/workflow.py
@@ -110,7 +110,6 @@ class WorkflowContext(BaseContext):
@property
@contextmanager
def track_changes(self):
- self._model.execution.update(self.execution)
yield
self._model.execution.update(self.execution)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/aa6f801d/tests/orchestrator/workflows/executor/test_process_executor.py
----------------------------------------------------------------------
diff --git a/tests/orchestrator/workflows/executor/test_process_executor.py b/tests/orchestrator/workflows/executor/test_process_executor.py
index ff2ca2e..cde5402 100644
--- a/tests/orchestrator/workflows/executor/test_process_executor.py
+++ b/tests/orchestrator/workflows/executor/test_process_executor.py
@@ -31,7 +31,6 @@ from tests import (
from tests.fixtures import ( # pylint: disable=unused-import
plugins_dir,
plugin_manager,
- fs_model as model
)
from tests.orchestrator.workflows.executor import put_to_storage_and_get_ctx
@@ -111,3 +110,8 @@ def ctx(tmpdir):
ctx.states = []
yield context
storage.release_sqlite_storage(context.model)
+
+
+@pytest.fixture
+def model(ctx):
+ return ctx.model
\ No newline at end of file