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/01 14:33:34 UTC
incubator-ariatosca git commit: tiny fix for several instrumenetation
fields [Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-262-Inconsistent-node-attributes-behavior 77866ab1e -> 558e162a9 (forced update)
tiny fix for several instrumenetation fields
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/558e162a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/558e162a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/558e162a
Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: 558e162a96900a2583cb4d1d7c7aac8289ec4a2b
Parents: bd7a438
Author: max-orlov <ma...@gigaspaces.com>
Authored: Thu Jun 1 17:30:39 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Thu Jun 1 17:33:29 2017 +0300
----------------------------------------------------------------------
aria/storage/collection_instrumentation.py | 3 +--
tests/orchestrator/context/test_operation.py | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/558e162a/aria/storage/collection_instrumentation.py
----------------------------------------------------------------------
diff --git a/aria/storage/collection_instrumentation.py b/aria/storage/collection_instrumentation.py
index 792f76c..4c93543 100644
--- a/aria/storage/collection_instrumentation.py
+++ b/aria/storage/collection_instrumentation.py
@@ -209,7 +209,7 @@ class _InstrumentedModel(object):
self._original_model = original_model
self._mapi = mapi
self._instrumentation = instrumentation
- self._instrumentation_cls = self._apply_instrumentation()
+ self._apply_instrumentation()
def __getattr__(self, item):
return_value = getattr(self._original_model, item)
@@ -239,7 +239,6 @@ class _InstrumentedModel(object):
mapi=self._mapi,
field_name=field_name)
setattr(self, field_name, instrumented_class)
- return instrumentation_cls
class _WrappedModel(object):
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/558e162a/tests/orchestrator/context/test_operation.py
----------------------------------------------------------------------
diff --git a/tests/orchestrator/context/test_operation.py b/tests/orchestrator/context/test_operation.py
index c50f2e3..59df059 100644
--- a/tests/orchestrator/context/test_operation.py
+++ b/tests/orchestrator/context/test_operation.py
@@ -263,7 +263,7 @@ def test_plugin_workdir(ctx, thread_executor, tmpdir):
@pytest.fixture(params=[
(thread.ThreadExecutor, {}),
- # (process.ProcessExecutor, {'python_path': [tests.ROOT_DIR]}),
+ (process.ProcessExecutor, {'python_path': [tests.ROOT_DIR]}),
])
def executor(request):
executor_cls, executor_kwargs = request.param