summaryrefslogtreecommitdiffstats
path: root/dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py
diff options
context:
space:
mode:
authorMichael Hwang <mhwang@research.att.com>2018-03-02 20:46:21 -0500
committerMichael Hwang <mhwang@research.att.com>2018-03-09 16:25:24 -0500
commitb11dae55f54720759431107e83f1070c10aacd96 (patch)
treedda6037b9301cbd20300bd566485cf4463124f4c /dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py
parent141bcd47087b39d2ac3846ace864b9d9b0706ff5 (diff)
Make tox work in a fresh scenario
Severing the unit tests from the local config dependency meant refactoring code that made pure unit testing impossible. Introduced a conftest in this commit. Change-Id: Id005b8b5b0704ccac33fa8768be1642941281f34 Issue-ID: DCAEGEN2-372 Signed-off-by: Michael Hwang <mhwang@research.att.com>
Diffstat (limited to 'dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py')
-rw-r--r--dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py b/dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py
index 67fe9bf..1ac176b 100644
--- a/dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py
+++ b/dcae-cli/dcae_cli/catalog/mock/tests/test_schema.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2018 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.
@@ -209,7 +209,7 @@ cdap_component_test = r'''
'''
-def test_basic():
+def test_basic(mock_cli_config):
validate_component(json.loads(component_test))
validate_format(json.loads(format_test))
validate_component(json.loads(cdap_component_test))
@@ -232,7 +232,7 @@ def test_basic():
-def test_validate_docker_config():
+def test_validate_docker_config(mock_cli_config):
def compose_spec(config):
spec = json.loads(component_test)
@@ -282,7 +282,7 @@ def test_validate_docker_config():
validate_component(spec)
-def test_validate_cdap_config():
+def test_validate_cdap_config(mock_cli_config):
def compose_spec(config):
spec = json.loads(cdap_component_test)
@@ -350,7 +350,7 @@ def test_apply_defaults():
'location': {'lat': '40', 'long': '75'}}
-def test_apply_defaults_docker_config():
+def test_apply_defaults_docker_config(mock_cli_config):
# Test: Adding of missing expected properties for http
dc = { "healthcheck": { "type": "http", "endpoint": "/foo" } }
actual = apply_defaults_docker_config(dc)