diff options
| author |   yayogev <yaronyogev@gmail.com> | 2018-02-27 17:00:05 +0200 |
|---|---|---|
| committer | yayogev <yaronyogev@gmail.com> | 2018-02-27 17:00:05 +0200 |
| commit | 648a394f7a318443dfd82f790f83a79616c26905 (patch) | |
| tree | 719508e9d99771c3de056a9c2914d461c35fb967 /app/test/api | |
| parent | 100add41cfe2b987524b190c1c92771a3c4f1d5f (diff) | |
US3541 merge various fixes to OPNFV branch
timestamp of last commit tt was merged: 26-Jan-2018 16:25.
Change-Id: I7b0bf7885d7d0badb81c794a52c480b905d78459
Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/test/api')
| -rw-r--r-- | app/test/api/responders_test/resource/test_clique_types.py | 3 | ||||
| -rw-r--r-- | app/test/api/responders_test/test_data/clique_types.py | 18 |
2 files changed, 9 insertions, 12 deletions
diff --git a/app/test/api/responders_test/resource/test_clique_types.py b/app/test/api/responders_test/resource/test_clique_types.py index 702bc87..5e52cea 100644 --- a/app/test/api/responders_test/resource/test_clique_types.py +++ b/app/test/api/responders_test/resource/test_clique_types.py @@ -12,7 +12,6 @@ import json from test.api.responders_test.test_data import base from test.api.test_base import TestBase from test.api.responders_test.test_data import clique_types -import unittest from unittest.mock import patch @@ -70,7 +69,6 @@ class TestCliqueTypes(TestBase): expected_code=base.BAD_REQUEST_CODE ) - @unittest.SkipTest @patch(base.RESPONDER_BASE_READ) def test_get_clique_type_with_correct_configuration(self, read): self.validate_get_request( @@ -272,7 +270,6 @@ class TestCliqueTypes(TestBase): expected_code=base.BAD_REQUEST_CODE ) - @unittest.SkipTest @patch(base.RESPONDER_BASE_READ) def test_post_clique_type_with_duplicate_configuration(self, read): data = clique_types.CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION[0] diff --git a/app/test/api/responders_test/test_data/clique_types.py b/app/test/api/responders_test/test_data/clique_types.py index 534b6f0..0791bdf 100644 --- a/app/test/api/responders_test/test_data/clique_types.py +++ b/app/test/api/responders_test/test_data/clique_types.py @@ -60,15 +60,15 @@ CLIQUE_TYPES_WITH_SPECIFIC_ID = [ get_payload(update={'id': CORRECT_ID}) ] -# CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION = [ -# get_payload(update={'id': SAMPLE_IDS[0], -# **TEST_CONFIGURATION}, -# delete=['environment']) -# ] +CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION = [ + get_payload(update={'id': SAMPLE_IDS[0], + **TEST_CONFIGURATION}, + delete=['environment']) +] -# CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION_RESPONSE = { -# "clique_types": CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION -# } +CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION_RESPONSE = { + "clique_types": CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION +} CLIQUE_TYPES_WITH_SPECIFIC_FOCAL_POINT_TYPE = [ get_payload(update={'id': _id, @@ -144,4 +144,4 @@ CLIQUE_TYPE_WITH_WRONG_MECH_DRIVERS = get_payload( CLIQUE_TYPE_WITH_WRONG_TYPE_DRIVERS = get_payload( update={'type_drivers': WRONG_TYPE_DRIVER} -) +)
\ No newline at end of file |