Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6D667200C7E for ; Tue, 23 May 2017 17:48:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6BF44160BB6; Tue, 23 May 2017 15:48:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B2049160BC3 for ; Tue, 23 May 2017 17:48:05 +0200 (CEST) Received: (qmail 66099 invoked by uid 500); 23 May 2017 15:48:04 -0000 Mailing-List: contact dev-help@ariatosca.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ariatosca.incubator.apache.org Delivered-To: mailing list dev@ariatosca.incubator.apache.org Received: (qmail 65925 invoked by uid 99); 23 May 2017 15:48:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 May 2017 15:48:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id EBE8CC0FD6 for ; Tue, 23 May 2017 15:48:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.22 X-Spam-Level: X-Spam-Status: No, score=-4.22 tagged_above=-999 required=6.31 tests=[HK_RANDOM_FROM=0.001, KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Fj_zDw3fC7v7 for ; Tue, 23 May 2017 15:48:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id CE78F5F2AB for ; Tue, 23 May 2017 15:48:01 +0000 (UTC) Received: (qmail 65031 invoked by uid 99); 23 May 2017 15:48:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 May 2017 15:48:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9EBA7DFB01; Tue, 23 May 2017 15:48:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mxmrlv@apache.org To: dev@ariatosca.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-ariatosca git commit: removed test fixes Date: Tue, 23 May 2017 15:48:00 +0000 (UTC) archived-at: Tue, 23 May 2017 15:48:06 -0000 Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution 51816fdb6 -> 8ce1dddd1 removed test fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8ce1dddd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8ce1dddd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8ce1dddd Branch: refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution Commit: 8ce1dddd180dc561d0cf5dd902839298a053b538 Parents: 51816fd Author: max-orlov Authored: Tue May 23 18:47:54 2017 +0300 Committer: max-orlov Committed: Tue May 23 18:47:54 2017 +0300 ---------------------------------------------------------------------- tests/orchestrator/execution_plugin/test_ctx_proxy_server.py | 3 +-- tests/orchestrator/workflows/executor/__init__.py | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8ce1dddd/tests/orchestrator/execution_plugin/test_ctx_proxy_server.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/execution_plugin/test_ctx_proxy_server.py b/tests/orchestrator/execution_plugin/test_ctx_proxy_server.py index a41f9f0..98ceff9 100644 --- a/tests/orchestrator/execution_plugin/test_ctx_proxy_server.py +++ b/tests/orchestrator/execution_plugin/test_ctx_proxy_server.py @@ -136,7 +136,7 @@ class TestCtxProxy(object): kwargs=kwargs) @pytest.fixture - def ctx(self, mocker): + def ctx(self): class MockCtx(object): pass ctx = MockCtx() @@ -160,7 +160,6 @@ class TestCtxProxy(object): ctx.stub_args = self.stub_args ctx.stub_attr = self.StubAttribute() ctx.node = self.NodeAttribute(properties) - ctx.model = mocker.MagicMock() return ctx @pytest.fixture http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8ce1dddd/tests/orchestrator/workflows/executor/__init__.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/executor/__init__.py b/tests/orchestrator/workflows/executor/__init__.py index 41c4b2e..1a462ca 100644 --- a/tests/orchestrator/workflows/executor/__init__.py +++ b/tests/orchestrator/workflows/executor/__init__.py @@ -73,8 +73,4 @@ class MockContext(object): if kwargs: return cls(storage=aria.application_model_storage(**kwargs)) else: - return cls() - - @staticmethod - def close(): - pass + return cls() \ No newline at end of file