Skip to content

Commit 1a65ce6

Browse files
committed
Wait a longer time between tests. Remove WebUI in setup instructions instead of config file
1 parent 76255f1 commit 1a65ce6

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Example: `python main.py --dir C:/Development/OpenSpace --test default/earth,ros
2626

2727
Additionally, a `config.json` must be provided if tests are to be submitted to the regression server. The `config.sample.json` provides a stub that can be used as the starting point for configuring the JSON file.
2828

29-
If no `config.json` is found, all tests are run locally and are not submitted to the regression server. Instead all resulting images are stored in a `tests` folder whose subfolders mimick the folder structure found in the `tests/visual` folder, resulting in images that can be manually inspected.
29+
If no `config.json` is found, all tests are run locally and are not submitted to the regression server. Instead all resulting images are stored in a `tests` folder whose subfolders mimick the folder structure found in the `visualtests` folder, resulting in images that can be manually inspected.
3030

3131
If a `config.json` is provided, it requires the specification of the URL at which the regression server is located, the hardware string under which the test images are submitted, and a runner id that has to be provided by the administrator of the regression test server. If all these values are correct, test images are directly submitted to the regression server and be can used to compare against a reference image.
3232

runner/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def setup_argparse():
184184
submit_image(result, hardware, timestamp, file, runner_id, submit_url)
185185
else:
186186
store_image(result, file)
187-
time.sleep(0.5)
187+
time.sleep(2.5)
188188
else:
189189
tests = args.test.split(",")
190190
print(f"Running tests: {tests}")
@@ -205,7 +205,7 @@ def setup_argparse():
205205
submit_image(result, hardware, timestamp, file, runner_id, submit_url)
206206
else:
207207
store_image(result, file)
208-
time.sleep(0.5)
208+
time.sleep(2.5)
209209

210210
global_end = time.perf_counter()
211211
print(f"Total time for all tests: {global_end - global_start}")

runner/testsuite/openspace.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ def write_configuration_overwrite(base_path, data_path):
4848
f.write("ModuleConfigurations.GlobeBrowsing.MRFCacheEnabled = true\n")
4949
f.write(f"ModuleConfigurations.GlobeBrowsing.MRFCacheLocation = [[{mrf_location}]]\n")
5050

51-
# Disable the UI as it contains different time-dependent content
52-
f.write(f"ModuleConfigurations.CefWebGui.Enabled = false\n")
53-
5451
# Remove the version checking URL as it would otherwise count as a "user"
5552
f.write("VersionCheckUrl = [[]]\n")
5653

@@ -72,10 +69,12 @@ async def setup_test_run(openspace):
7269
await openspace.time.setPause(True)
7370

7471
# Unless explicitly added, we don't want display elements that show variable content
72+
# User Interface: Making the screenshots nicer to look at
7573
# Dashboard: Framerate
7674
# ScreenLog: Log message retention
7775
# Version: Contains the commit hash
78-
# Camera: Not technically needed, but results in a cleaner time
76+
# Camera: Not technically needed, but results in a cleaner screenshot
77+
await openspace.setPropertyValueSingle("Modules.CefWebGui.Enabled", False)
7978
await openspace.setPropertyValueSingle("Dashboard.IsEnabled", False)
8079
await openspace.setPropertyValueSingle("RenderEngine.ShowLog", False)
8180
await openspace.setPropertyValueSingle("RenderEngine.ShowVersion", False)

0 commit comments

Comments
 (0)