commit cde503fb6d637977dcd36ef594a8721994c5903e
author Devin Lim <devin@opennetworking.org> Mon Sep 11 17:23:30 2017 -0700
committer Devin Lim <devin@opennetworking.org> Mon Sep 11 23:26:35 2017 -0700
tree 0570ed9f31b432dbfed3ee468e2972c99615ec99
parent 4f360bc64f8d4730ba1c8a966d585c8826d7a1ba

[ONOS-7029] Investigate and fix the PLATdockertest

Change-Id: Ib0cc83b722e9cc22fcadd3986e9047a5a6b89429

TestON/tests/PLAT/PLATdockertest/PLATdockertest.py

diff --git a/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py b/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py
index a64ad3a..9cbe929 100755
--- a/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py
+++ b/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py
@@ -36,7 +36,7 @@
 
     def __init__( self ):
         self.default = ''
-        global DOCKERREPO, DOCKERTAG
+        global DOCKERREPO, DOCKERTAG, INITDOCKERTAG
         global IPlist
         global CTIDlist
         global NODElist
@@ -82,6 +82,8 @@
 
         if imageTagCounter < len( imageTagList ):
             DOCKERTAG = imageTagList[imageTagCounter]
+        if not imageTagCounter:
+            INITDOCKERTAG = DOCKERTAG
         imageTagCounter += 1
 
         main.case("Set case test params for onos image {}".format( DOCKERTAG ))
@@ -387,6 +389,7 @@
                     if matchObj:
                         wordsToRemove = re.compile("latest|- PASS|- FAIL|- No Result")
                         testCaseName = wordsToRemove.sub("", matchObj.group(1))
+                        testCaseName = testCaseName.replace( INITDOCKERTAG,'' )
                         testCaseList.append(testCaseName)
                         testCaseCounter += 1
                 if matchObj: