commit 075cc7aed41f1e7819357281ec70297ba00062c0
author Oleksii Zhurba <ozhurba@mirantis.com> Fri May 17 14:04:28 2019 -0500
committer Oleksii Zhurba <ozhurba@mirantis.com> Tue May 21 11:57:22 2019 -0500
tree 19b172c067b47f46c7a747435023e1fdd70fe018
parent 56eab9451d7505ebe108605a9804b07ce0be201a

[CVP] Fix several small issues found during testing

Related-PROD: PROD-30404
Change-Id: Ied92729a59fa9b053a09ce27733bb0db1df692e8

test_set/cvp-sanity/tests/test_drivetrain.py

diff --git a/test_set/cvp-sanity/tests/test_drivetrain.py b/test_set/cvp-sanity/tests/test_drivetrain.py
index 1b71ad0..63d304b 100644
--- a/test_set/cvp-sanity/tests/test_drivetrain.py
+++ b/test_set/cvp-sanity/tests/test_drivetrain.py
@@ -316,7 +316,7 @@
             continue
 
         actual_version = BranchSpec[0].getElementsByTagName('name')[0].childNodes[0].data
-        if actual_version not in expected_version and expected_version != '':
+        if expected_version and actual_version not in expected_version:
             version_mismatch.append("Job {0} has {1} branch."
                                     "Expected {2}".format(job_name,
                                                           actual_version,
@@ -440,4 +440,4 @@
             sep="\n" + "-" * 20 + "\n",
             kubectl_output=pods_statuses_output,
             report=report_with_errors
-        )
\ No newline at end of file
+        )