From 2fcc882d69dc4a59846ef2ff6b352e40c3f5cf49 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 29 Mar 2018 08:01:27 -0400 Subject: Revert "add capability to take over ..." This reverts commit adcb1dfaf4d88062c11630fee59eacb15965c373. Issue-ID: CCSDK-228 Change-Id: Ib88a52888c1b9f9adfcc22fecf2f8c297621a81a Signed-off-by: Timoney, Dan (dt5972) --- pgaas/tests/test_plugin.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'pgaas/tests') diff --git a/pgaas/tests/test_plugin.py b/pgaas/tests/test_plugin.py index 197654e..5561f16 100644 --- a/pgaas/tests/test_plugin.py +++ b/pgaas/tests/test_plugin.py @@ -1,7 +1,7 @@ # ============LICENSE_START==================================================== # org.onap.ccsdk # ============================================================================= -# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -60,15 +60,6 @@ class MockRuntimeProperties(object): def runtime_properties(self): return self._runtime_properties -class MockSocket(object): - def __init__(self): - pass - def connect(self,host=None,port=None): - pass - def close(self): - pass - - def _connect(h,p): return { } @@ -79,9 +70,7 @@ def set_mock_context(msg, monkeypatch): 'writerfqdn': 'test.bar.example.com', 'use_existing': False, 'readerfqdn': 'test-ro.bar.example.com', - 'name': 'testdb', - 'port': '5432', - 'initialpassword': 'test' + 'name': 'testdb' } sshkeyprops = { @@ -119,6 +108,14 @@ def test_add_pgaas_cluster(monkeypatch): current_ctx.clear() os.system("echo After test; ls -l /tmp/pgaas") #### DELETE +class MockSocket(object): + def __init__(self): + pass + def connect(self,host=None,port=None): + pass + def close(self): + pass + @pytest.mark.dependency(depends=['test_add_pgaas_cluster']) def test_add_database(monkeypatch): try: -- cgit