Skip to content

Commit

Permalink
Fixing dart tests (#84)
Browse files Browse the repository at this point in the history
* Fix ICU data version on summary page

* Add space in unsupported label

* Update testdriver to handle dart_web test execution
  • Loading branch information
sven-oly authored Aug 10, 2023
1 parent a13007e commit 3334919
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion testdriver/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class ExecutorLang(Enum):
ExecutorCommands = {
"node" : "node ../executors/node/executor.js",
"dart_web" : "node ../executors/dart_web/out/executor.js",
"dart_native" : "executors/dart_native/bin/executor.exe",
"dart_native" : "../executors/dart_native/bin/executor.exe",
"rust" : "../executors/rust/target/release/executor",
"cpp": "../executors/cpp/executor",
"java" : None
Expand Down
16 changes: 10 additions & 6 deletions testdriver/testplan.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ def __init__(self, exec_data, test_type, args=None):
self.exec_command = exec_data['path']
if 'env' in exec_data:
self.exec_env = exec_data['env']
self.test_type = test_type
self.runStyle = 'one_test'
self.parallelMode = None
self.options = None
self.testData = None
self.test_type = test_type
self.runStyle = 'one_test'
self.parallelMode = None
self.options = None
self.testData = None

# Additional args to subprocess.run
self.args = args
Expand Down Expand Up @@ -152,7 +152,10 @@ def request_executor_info(self):
self.jsonOutput["platform"] = json.loads(result)
self.platformVersion = self.jsonOutput["platform"]["platformVersion"]
self.icuVersion = self.jsonOutput["platform"]["icuVersion"]
self.cldrVersion = self.jsonOutput["platform"]["cldrVersion"]
try:
self.cldrVersion = self.jsonOutput["platform"]["cldrVersion"]
except KeyError:
self.cldrVersion = 'CLDR version not specified'

# TODO: Clean this up!
# Get the test data area from the icu_version
Expand Down Expand Up @@ -247,6 +250,7 @@ def run_one_test_mode(self):
# Start the JSON output
# Set up calls for version data --> results
if not self.request_executor_info():
# TODO: Report problem with executor (somehow).
return None

# Use for directory of the output results
Expand Down
2 changes: 1 addition & 1 deletion verifier/detail_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ <h2 id='testErrors'>Test Errors ($error_count)</h2>
</details>

<details>
<summary>Unsupported Tests errors <span id='unsupported_count'>($unsupported_count)</span></summary>
<summary>Unsupported tests <span id='unsupported_count'>($unsupported_count)</span></summary>
<div id="unsupported-pagination-container"></div>
<div id="unsupported-data-container"></div>
<div id='testUnsupportedCharacterized'>
Expand Down
2 changes: 1 addition & 1 deletion verifier/summary_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
let link = '<a href="' +
report['html_file_name'] + '"' +
' target="_blank">' +
report['version']['icuVersion'] +
report['icu_version'] +
'</a><br />';
details.push(link);
}
Expand Down

0 comments on commit 3334919

Please sign in to comment.