Properly exit when tests fail.

tests/run_tests.py

@@ -39,87 +39,83 @@ driver = webdriver.Firefox(firefox_profile=fp)
 driver.set_window_size(800, 600)
 
 
-# Load page
-print("Loading page...")
-driver.get("http://127.0.0.1:12345/tests/tests.html")
-
-
-# Make sure viewer loaded
-print("Running tests...")
-time.sleep(5)
-viewer = driver.find_element_by_id("panorama")
-assert driver.execute_script("return viewer.isLoaded()") == True
-
-
-# Check equirectangular
-assert driver.execute_script("return viewer.getScene() == 'equirectangular'")
-if CREATE_REF:
-    viewer.screenshot("tests/equirectangular.png")
-    subprocess.call(["optipng", "-o7", "-strip", "all", "equirectangular.png"])
-else:
-    reference = Image.open("tests/equirectangular.png")
-    screenshot = Image.open(io.BytesIO(viewer.screenshot_as_png)).convert("RGB")
-    assert np.mean(np.array(ImageChops.difference(screenshot, reference))) < 1
-print("PASS: equirectangular")
-
-
-# Check movement
-driver.execute_script("viewer.setPitch(30).setYaw(-20).setHfov(90)")
-time.sleep(2)
-assert driver.execute_script(
-    "return viewer.getPitch() == 30 && viewer.getYaw() == -20 && viewer.getHfov() == 90"
-)
-driver.find_element_by_class_name("pnlm-zoom-in").click()
-time.sleep(1)
-assert driver.execute_script("return viewer.getHfov() == 85")
-driver.find_element_by_class_name("pnlm-zoom-out").click()
-time.sleep(1)
-assert driver.execute_script("return viewer.getHfov() == 90")
-print("PASS: movement")
-
-
-# Check look at
-driver.execute_script("viewer.lookAt(-10, 90, 100)")
-time.sleep(2)
-assert driver.execute_script(
-    "return viewer.getPitch() == -10 && viewer.getYaw() == 90 && viewer.getHfov() == 100"
-)
-print("PASS: look at")
-
-
-# Check cube
-driver.execute_script("viewer.loadScene('cube')")
-time.sleep(5)
-assert driver.execute_script("return viewer.getScene() == 'cube'")
-if CREATE_REF:
-    viewer.screenshot("tests/cube.png")
-    subprocess.call(["optipng", "-o7", "-strip", "all", "cube.png"])
-else:
-    reference = Image.open("tests/cube.png")
-    screenshot = Image.open(io.BytesIO(viewer.screenshot_as_png)).convert("RGB")
-    assert np.mean(np.array(ImageChops.difference(screenshot, reference))) < 1
-print("PASS: cube")
-
-
-# Check hot spot
-driver.find_element_by_class_name("pnlm-scene").click()
-time.sleep(5)
-assert driver.execute_script("return viewer.getScene() == 'multires'")
-print("PASS: hot spot")
-
-
-# Check multires
-if CREATE_REF:
-    viewer.screenshot("tests/multires.png")
-    subprocess.call(["optipng", "-o7", "-strip", "all", "multires.png"])
-else:
-    reference = Image.open("tests/multires.png")
-    screenshot = Image.open(io.BytesIO(viewer.screenshot_as_png)).convert("RGB")
-    assert np.mean(np.array(ImageChops.difference(screenshot, reference))) < 1
-print("PASS: multires")
-
-
-# Done
-driver.quit()
-httpd.shutdown()
-thread.join()
+def run_tests():
+    # Load page
+    print("Loading page...")
+    driver.get("http://127.0.0.1:12345/tests/tests.html")
+
+    # Make sure viewer loaded
+    print("Running tests...")
+    time.sleep(5)
+    viewer = driver.find_element_by_id("panorama")
+    assert driver.execute_script("return viewer.isLoaded()") == True
+
+    # Check equirectangular
+    assert driver.execute_script("return viewer.getScene() == 'equirectangular'")
+    if CREATE_REF:
+        viewer.screenshot("tests/equirectangular.png")
+        subprocess.call(["optipng", "-o7", "-strip", "all", "equirectangular.png"])
+    else:
+        reference = Image.open("tests/equirectangular.png")
+        screenshot = Image.open(io.BytesIO(viewer.screenshot_as_png)).convert("RGB")
+        assert np.mean(np.array(ImageChops.difference(screenshot, reference))) < 1
+    print("PASS: equirectangular")
+
+    # Check movement
+    driver.execute_script("viewer.setPitch(30).setYaw(-20).setHfov(90)")
+    time.sleep(2)
+    assert driver.execute_script(
+        "return viewer.getPitch() == 30 && viewer.getYaw() == -20 && viewer.getHfov() == 90"
+    )
+    driver.find_element_by_class_name("pnlm-zoom-in").click()
+    time.sleep(1)
+    assert driver.execute_script("return viewer.getHfov() == 85")
+    driver.find_element_by_class_name("pnlm-zoom-out").click()
+    time.sleep(1)
+    assert driver.execute_script("return viewer.getHfov() == 90")
+    print("PASS: movement")
+
+    # Check look at
+    driver.execute_script("viewer.lookAt(-10, 90, 100)")
+    time.sleep(2)
+    assert driver.execute_script(
+        "return viewer.getPitch() == -10 && viewer.getYaw() == 90 && viewer.getHfov() == 100"
+    )
+    print("PASS: look at")
+
+    # Check cube
+    driver.execute_script("viewer.loadScene('cube')")
+    time.sleep(5)
+    assert driver.execute_script("return viewer.getScene() == 'cube'")
+    if CREATE_REF:
+        viewer.screenshot("tests/cube.png")
+        subprocess.call(["optipng", "-o7", "-strip", "all", "cube.png"])
+    else:
+        reference = Image.open("tests/cube.png")
+        screenshot = Image.open(io.BytesIO(viewer.screenshot_as_png)).convert("RGB")
+        assert np.mean(np.array(ImageChops.difference(screenshot, reference))) < 1
+    print("PASS: cube")
+
+    # Check hot spot
+    driver.find_element_by_class_name("pnlm-scene").click()
+    time.sleep(5)
+    assert driver.execute_script("return viewer.getScene() == 'multires'")
+    print("PASS: hot spot")
+
+    # Check multires
+    if CREATE_REF:
+        viewer.screenshot("tests/multires.png")
+        subprocess.call(["optipng", "-o7", "-strip", "all", "multires.png"])
+    else:
+        reference = Image.open("tests/multires.png")
+        screenshot = Image.open(io.BytesIO(viewer.screenshot_as_png)).convert("RGB")
+        assert np.mean(np.array(ImageChops.difference(screenshot, reference))) < 1
+    print("PASS: multires")
+
+
+try:
+    run_tests()
+finally:
+    driver.quit()
+    httpd.shutdown()
+    thread.join()