selenium : Assert that test result is empty at start

slapos/recipe/seleniumrunner/testrunner.py

@@ -47,36 +47,38 @@ def run(args):
     # Clean old test results if any
     openUrl('%s/TestTool_cleanUpTestResults?__ac_name=%s&__ac_password=%s' % (
         config['base_url'], config['user'], config['password']))
-    # TODO assert getresult is None
-
-    os.environ['DISPLAY'] = config['display']
-    xvfb = Xvfb(config['etc_directory'], config['xvfb_binary'])
-    profile_dir = os.path.join(config['etc_directory'], 'profile')
-    browser = Firefox(profile_dir, config['base_url'], config['browser_binary'])
-    try:
-      start = time.time()
-      xvfb.run()
+    if getStatus(config['base_url']) is not '':
+      print("ERROR : Impossible to clean old test result(s)")
+    else:
+      # Environment is ready, we launch test.
+      os.environ['DISPLAY'] = config['display']
+      xvfb = Xvfb(config['etc_directory'], config['xvfb_binary'])
       profile_dir = os.path.join(config['etc_directory'], 'profile')
-      browser.run(test_url , xvfb.display)
-      erp5_report.reportStart()
-      while getStatus(config['base_url']) is '':
-        time.sleep(10)
-        if (time.time() - start) > float(timeout):
-          raise TimeoutError("Test took more them %s seconds" % timeout)
-    except TimeoutError:
-      continue
-    finally:
-      browser.quit()
-      xvfb.quit()
-
-    erp5_report.reportFinished(getStatus(config['base_url']).encode("utf-8",
-        "replace"))
-
-    # Clean test results for next test
-    openUrl('%s/TestTool_cleanUpTestResults?__ac_name=%s&__ac_password=%s' % (
-        config['base_url'], config['user'], config['password']))
-
-    print("Test finished and report sent, sleeping.")
+      browser = Firefox(profile_dir, config['base_url'], config['browser_binary'])
+      try:
+        start = time.time()
+        xvfb.run()
+        profile_dir = os.path.join(config['etc_directory'], 'profile')
+        browser.run(test_url , xvfb.display)
+        erp5_report.reportStart()
+        while getStatus(config['base_url']) is '':
+          time.sleep(10)
+          if (time.time() - start) > float(timeout):
+            raise TimeoutError("Test took more them %s seconds" % timeout)
+      except TimeoutError:
+        continue
+      finally:
+        browser.quit()
+        xvfb.quit()
+      
+      erp5_report.reportFinished(getStatus(config['base_url']).encode("utf-8",
+          "replace"))
+      
+      # Clean test results for next test
+      openUrl('%s/TestTool_cleanUpTestResults?__ac_name=%s&__ac_password=%s' % (
+          config['base_url'], config['user'], config['password']))
+      
+      print("Test finished and report sent, sleeping.")
     sleep(3600)
 
 def openUrl(url):