commit e01d5e87199bfee2e0df75dabc189d9f339ec944
author Oleksii Zhurba <ozhurba@mirantis.com> Fri May 17 14:04:28 2019 -0500
committer Oleksii Zhurba <ozhurba@mirantis.com> Wed May 22 20:34:27 2019 +0000
tree 7b1de947edd14f419d0802203ce728a253988a15
parent 448c1b8f6c83c305cb8db6b359939bcb3ddb3674

[CVP,Q4] Fix several small issues found during testing

Change-Id: Ied92729a59fa9b053a09ce27733bb0db1df692e8
Related-PROD: PROD-30482

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 3a9f1b6..f892932 100644
--- a/test_set/cvp-sanity/tests/test_drivetrain.py
+++ b/test_set/cvp-sanity/tests/test_drivetrain.py
@@ -309,7 +309,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,
@@ -432,4 +432,4 @@
             sep="\n" + "-" * 20 + "\n",
             kubectl_output=pods_statuses_output,
             report=report_with_errors
-        )
\ No newline at end of file
+        )