Kunal Pai has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/71359?usp=email ) Change subject: tests: Fix bugs related to gem5 Vision ...................................................................... tests: Fix bugs related to gem5 Vision This patch fixes refs under tests/pyunit/stdlib/resources. Removes instances of {url_base} in refs. Also, renames two refs: mongo_mock and mongo_dup_mock to mongo-mock and mongo-dup-mock to follow naming convention of other refs. Change-Id: I2d0b617e3c4aecf7c8239b8e8af614b6b2a1b530 Co-authored-by: Parth Shah <helloparthshah@gmail.com> Co-authored-by: Harshil2107 <harshilp2107@gmail.com> Co-authored-by: aarsli <arsli@ucdavis.edu> --- M tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py R tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json R tests/pyunit/stdlib/resources/refs/mongo-mock.json M tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json M tests/pyunit/stdlib/resources/refs/workload-checks.json 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py index 96aadf6..344f67b 100644 --- a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py +++ b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py @@ -82,12 +82,12 @@ mock_json = {} -with open(Path(__file__).parent / "refs/mongo_mock.json", "r") as f: +with open(Path(__file__).parent / "refs/mongo-mock.json", "r") as f: mock_json = json.load(f) duplicate_mock_json = {} -with open(Path(__file__).parent / "refs/mongo_dup_mock.json", "r") as f: +with open(Path(__file__).parent / "refs/mongo-dup-mock.json", "r") as f: duplicate_mock_json = json.load(f) diff --git a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json similarity index 90% rename from tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json rename to tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json index fe87cc8..c5e7ecd 100644 --- a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json +++ b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json @@ -21,7 +21,7 @@ "23.0" ], "workload_name": "x86-print-this-15000-with-simpoints", - "example_usage": "get_resource(resource_name=\"x86-print-this-1500-simpoints\")", + "example_usage": "obtain_resource(resource_name=\"x86-print-this-1500-simpoints\")", "workloads": [ "x86-print-this-15000-with-simpoints", "x86-print-this-15000-with-simpoints-and-checkpoint" diff --git a/tests/pyunit/stdlib/resources/refs/mongo_mock.json b/tests/pyunit/stdlib/resources/refs/mongo-mock.json similarity index 95% rename from tests/pyunit/stdlib/resources/refs/mongo_mock.json rename to tests/pyunit/stdlib/resources/refs/mongo-mock.json index b6376cc..11469b0 100644 --- a/tests/pyunit/stdlib/resources/refs/mongo_mock.json +++ b/tests/pyunit/stdlib/resources/refs/mongo-mock.json @@ -51,6 +51,6 @@ "gem5_versions": [ "23.0" ], - "example_usage": "get_resource(resource_name=\"x86-ubuntu-18.04-img\")" + "example_usage": "obtain_resource(resource_name=\"x86-ubuntu-18.04-img\")" } ] diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json index 5c03ae0..f336915 100644 --- a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json +++ b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json @@ -6,11 +6,11 @@ "architecture": "X86", "is_zipped": false, "md5sum": "dbf120338b37153e3334603970cebd8c", - "url": "{url_base}/test-progs/hello/bin/x86/linux/hello64-static", + "url": "https://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static", "source": "src/simple", "resource_version": "1.0.0", "gem5_versions": [ "23.0" ] } -] \ No newline at end of file +] diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks.json b/tests/pyunit/stdlib/resources/refs/workload-checks.json index d19396b..c9554a9 100644 --- a/tests/pyunit/stdlib/resources/refs/workload-checks.json +++ b/tests/pyunit/stdlib/resources/refs/workload-checks.json @@ -6,7 +6,7 @@ "architecture": "X86", "is_zipped": false, "md5sum": "4838c99b77d33c8307b939c16624e4ac", - "url": "{url_base}/kernels/x86/static/vmlinux-5.2.3", + "url": "https://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3", "source": "src/linux-kernel", "resource_version": "1.0.0", "gem5_versions": [ @@ -20,7 +20,7 @@ "architecture": "X86", "is_zipped": true, "md5sum": "90e363abf0ddf22eefa2c7c5c9391c49", - "url": "{url_base}/images/x86/ubuntu-18-04/x86-ubuntu.img.gz", + "url": "https://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz", "source": "src/x86-ubuntu", "root_partition": "1", "resource_version": "1.0.0", -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/71359?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I2d0b617e3c4aecf7c8239b8e8af614b6b2a1b530 Gerrit-Change-Number: 71359 Gerrit-PatchSet: 1 Gerrit-Owner: Kunal Pai <kunpai@ucdavis.edu>