From e89188adacacb72c11f557168f7ee48175c93837 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 23 Aug 2017 11:09:15 +0800 Subject: bugfix: malfunction of scenario equal check 1. bugfix equal check with[] will return list[false, true], and always True in next step check 2. in assert_res() leverage '==' will never assert even if they are not equal Change-Id: I683e3489d45b98b508f8ab8b6ef268ca9a1ebd5f Signed-off-by: SerenaFeng --- testapi/opnfv_testapi/tests/unit/resources/scenario-c2.json | 4 ++-- testapi/opnfv_testapi/tests/unit/resources/test_scenario.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'testapi/opnfv_testapi/tests') diff --git a/testapi/opnfv_testapi/tests/unit/resources/scenario-c2.json b/testapi/opnfv_testapi/tests/unit/resources/scenario-c2.json index b6a3b83..980051c 100644 --- a/testapi/opnfv_testapi/tests/unit/resources/scenario-c2.json +++ b/testapi/opnfv_testapi/tests/unit/resources/scenario-c2.json @@ -8,7 +8,7 @@ [ { "owner": "Lucky", - "version": "colorado", + "version": "danube", "projects": [ { @@ -29,7 +29,7 @@ "scores": [ { "date": "2017-01-08 22:46:44", - "score": "0" + "score": "0/1" } ], "trust_indicators": [ diff --git a/testapi/opnfv_testapi/tests/unit/resources/test_scenario.py b/testapi/opnfv_testapi/tests/unit/resources/test_scenario.py index 466caaf..f9bb58c 100644 --- a/testapi/opnfv_testapi/tests/unit/resources/test_scenario.py +++ b/testapi/opnfv_testapi/tests/unit/resources/test_scenario.py @@ -47,8 +47,7 @@ class TestScenarioBase(base.TestBase): req = self.req_d self.assertIsNotNone(scenario._id) self.assertIsNotNone(scenario.creation_date) - - scenario == models.Scenario.from_dict(req) + self.assertEqual(scenario, models.Scenario.from_dict(req)) @staticmethod def _set_query(*args): @@ -298,7 +297,7 @@ class TestScenarioUpdate(TestScenarioBase): @update_partial('_update', '_success') def test_changeOwner(self, scenario): new_owner = 'new_owner' - scenario['installers'][0]['versions'][0]['owner'] = 'www' + scenario['installers'][0]['versions'][0]['owner'] = new_owner return new_owner, scenario def _add(self, update_req, new_scenario): -- cgit 1.2.3-korg