X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fmodel%2Fparse.py;h=1e0aebfe18320b684d3e1514f6c08b4c74ed15b7;hb=c4b7705089d6c2d01f743c2e93087a6a44025e6a;hp=b2e8da67ea778f5949c8beb7832a5c5367e6aea2;hpb=f890c0cbdee1b0da6e15cc1a9c2b14a423aa2b83;p=csit.git diff --git a/resources/libraries/python/model/parse.py b/resources/libraries/python/model/parse.py index b2e8da67ea..1e0aebfe18 100644 --- a/resources/libraries/python/model/parse.py +++ b/resources/libraries/python/model/parse.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -54,6 +54,9 @@ def parse(dirpath: str, fake_value: float = 1.0) -> Dict[str, List[float]]: Units are ignored, as both parent and current are tested with the same CSIT code so the unit should be identical. + The test results are sorted by test_id, + as the filesystem order is not deterministic enough. + The result is also cached as results.json file. :param dirpath: Path to the directory tree to examine. @@ -103,6 +106,7 @@ def parse(dirpath: str, fake_value: float = 1.0) -> Dict[str, List[float]]: results[name] = [result_object["bandwidth"]["value"]] else: raise RuntimeError(f"Unknown result type: {result_type}") + results = {test_id: results[test_id] for test_id in sorted(results)} with open(resultpath, "wt", encoding="utf8") as file_out: json.dump(results, file_out, indent=1, separators=(", ", ": ")) return results