From 2d2a19162e3691e4073bf9dc920b88edaace6c11 Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Fri, 16 Sep 2016 06:05:46 -0400 Subject: [PATCH] Fix SO restart without test-name Signed-off-by: Philip Joseph --- rwlaunchpad/test/launchpad.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rwlaunchpad/test/launchpad.py b/rwlaunchpad/test/launchpad.py index 80367928..53e4d361 100755 --- a/rwlaunchpad/test/launchpad.py +++ b/rwlaunchpad/test/launchpad.py @@ -472,8 +472,9 @@ def main(argv=sys.argv[1:]): 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 @@ def main(argv=sys.argv[1:]): 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: -- 2.25.1