commit f04e0aed7b77ad8833fa18ee083b5332bdb0da20
author velandy <rajesh.velandy@riftio.com> Mon Sep 19 14:39:08 2016 +0200
committer Gerrit Code Review <root@osm.etsi.org> Mon Sep 19 14:39:08 2016 +0200
tree 0b5f9c0131090f7d067b296aef0617d8849ee232
parent 699e14141627d8f8fd30abc07c87c1e081215762
parent 2d2a19162e3691e4073bf9dc920b88edaace6c11

Merge "Fix SO restart without test-name"

rwlaunchpad/test/launchpad.py

diff --git a/rwlaunchpad/test/launchpad.py b/rwlaunchpad/test/launchpad.py
index 8036792..53e4d36 100755
--- a/rwlaunchpad/test/launchpad.py
+++ b/rwlaunchpad/test/launchpad.py
@@ -472,8 +472,9 @@
 
 
     cleanup_dir_name = None
-    if os.environ["INSTALLDIR"] in ["/", "/home/rift", "/home/rift/.install"]:
-        cleanup_dir_name = os.environ["INSTALLDIR"] + "/"
+    if os.environ["INSTALLDIR"] in ["/", "/home/rift", "/home/rift/.install",
+        "/usr/rift/build/fc20_debug/install/usr/rift", "/usr/rift"]:
+        cleanup_dir_name = os.environ["INSTALLDIR"] + "/var/rift/"
 
     if args.test_name and not cleanup_dir_name:
         cleanup_dir_name = "find {rift_install}/var/rift -name '*{pattern}*' -type d".format( \
@@ -486,7 +487,8 @@
             print ("Directory not found exception occurred. Probably running for first time")
             print ("Zookeper cleanup cmd = {}".format(cleanup_dir_name))
     else:
-        cleanup_dir_name = os.environ["INSTALLDIR"] + "/"
+        if not cleanup_dir_name:
+          cleanup_dir_name = os.environ["INSTALLDIR"] + "/"
 
     # Remove the persistent Redis data
     try: