Skip to content

Commit

Permalink
Update regression tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaronweeden
aaronweeden committed May 23, 2024
1 parent 168fa14 commit 2af3dc8
Show file tree
Hide file tree
Showing 8 changed files with 3,587 additions and 27 deletions.
6 changes: 5 additions & 1 deletion ...ifacts/xdmod/regression/current/expected/reference/raw-data/cloud-fields-and-filters.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{"success":true,"fields":["Instance ID","PI Group","Instance Type"],"data":[["172df8e9-b2ec-4864-898d-a4d401de85f0","Polar Ocean and Climate Systems","m1.small"],["4d5e602e-97b7-4839-8818-097d6bcc8e62","Polar Ocean and Climate Systems","m1.small"],["dde9e2fb-a519-4299-a35f-8a096a46404c","Galactic Astronomy","m1.medium"],["b9c560b9-1066-483c-895e-aebb8b3c7ac1","Polar Ocean and Climate Systems","m1.medium"]]}
["Instance ID","PI Group","Instance Type"]
["172df8e9-b2ec-4864-898d-a4d401de85f0","Polar Ocean and Climate Systems","m1.small"]
["4d5e602e-97b7-4839-8818-097d6bcc8e62","Polar Ocean and Climate Systems","m1.small"]
["dde9e2fb-a519-4299-a35f-8a096a46404c","Galactic Astronomy","m1.medium"]
["b9c560b9-1066-483c-895e-aebb8b3c7ac1","Polar Ocean and Climate Systems","m1.medium"]
854 changes: 853 additions & 1 deletion tests/artifacts/xdmod/regression/current/expected/reference/raw-data/cloud.json
View file

Large diffs are not rendered by default.

90 changes: 89 additions & 1 deletion ...tifacts/xdmod/regression/current/expected/reference/raw-data/jobs-fields-and-filters.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,89 @@
{"success":true,"fields":["Local Job Id","Resource","PI Group"],"data":[["965514","Mortorq","Arts"],["2277129","Frearson","Mechanics and Materials"],["2278289","Frearson","Mechanics and Materials"],["2280582","Frearson","Mechanics and Materials"],["2281719","Frearson","Mechanics and Materials"],["2283011","Frearson","Mechanics and Materials"],["2284170","Frearson","Mechanics and Materials"],["2276367","Frearson","Mechanics and Materials"],["2277515","Frearson","Mechanics and Materials"],["2278652","Frearson","Mechanics and Materials"],["2279817","Frearson","Mechanics and Materials"],["2283415","Frearson","Mechanics and Materials"],["2277514","Frearson","Mechanics and Materials"],["2278288","Frearson","Mechanics and Materials"],["2279028","Frearson","Mechanics and Materials"],["2279816","Frearson","Mechanics and Materials"],["2280583","Frearson","Mechanics and Materials"],["2283010","Frearson","Mechanics and Materials"],["2283780","Frearson","Mechanics and Materials"],["2276029","Frearson","Mechanics and Materials"],["2279419","Frearson","Mechanics and Materials"],["2280952","Frearson","Mechanics and Materials"],["2282190","Frearson","Mechanics and Materials"],["2284537","Frearson","Mechanics and Materials"],["2276028","Frearson","Mechanics and Materials"],["2276742","Frearson","Mechanics and Materials"],["2281355","Frearson","Mechanics and Materials"],["2282191","Frearson","Mechanics and Materials"],["2284538","Frearson","Mechanics and Materials"],["992569","Mortorq","Arts"],["992636","Mortorq","Arts"],["2288365","Frearson","Mechanics and Materials"],["2291016","Frearson","Mechanics and Materials"],["2294671","Frearson","Mechanics and Materials"],["2301876","Frearson","Mechanics and Materials"],["2305417","Frearson","Mechanics and Materials"],["2285666","Frearson","Mechanics and Materials"],["2286842","Frearson","Mechanics and Materials"],["2292204","Frearson","Mechanics and Materials"],["2299515","Frearson","Mechanics and Materials"],["2285268","Frearson","Mechanics and Materials"],["2286052","Frearson","Mechanics and Materials"],["2286841","Frearson","Mechanics and Materials"],["2288364","Frearson","Mechanics and Materials"],["2292205","Frearson","Mechanics and Materials"],["2294670","Frearson","Mechanics and Materials"],["2297063","Frearson","Mechanics and Materials"],["2299516","Frearson","Mechanics and Materials"],["2301877","Frearson","Mechanics and Materials"],["2285269","Frearson","Mechanics and Materials"],["2286426","Frearson","Mechanics and Materials"],["2298323","Frearson","Mechanics and Materials"],["2289247","Frearson","Mechanics and Materials"],["2295886","Frearson","Mechanics and Materials"],["2303092","Frearson","Mechanics and Materials"],["2306562","Frearson","Mechanics and Materials"],["2290103","Frearson","Mechanics and Materials"],["2304240","Frearson","Mechanics and Materials"],["2306563","Frearson","Mechanics and Materials"],["1004733","Mortorq","Arts"],["2310438","Frearson","Mechanics and Materials"],["2312160","Frearson","Mechanics and Materials"],["2310140","Frearson","Mechanics and Materials"],["2311056","Frearson","Mechanics and Materials"],["2312352","Frearson","Mechanics and Materials"],["2310139","Frearson","Mechanics and Materials"],["2310437","Frearson","Mechanics and Materials"],["2310740","Frearson","Mechanics and Materials"],["2311057","Frearson","Mechanics and Materials"],["2311929","Frearson","Mechanics and Materials"],["2312351","Frearson","Mechanics and Materials"],["2313130","Frearson","Mechanics and Materials"],["2308880","Frearson","Mechanics and Materials"],["2309972","Frearson","Mechanics and Materials"],["2310877","Frearson","Mechanics and Materials"],["2311530","Frearson","Mechanics and Materials"],["2312737","Frearson","Mechanics and Materials"],["2313281","Frearson","Mechanics and Materials"],["2309580","Frearson","Mechanics and Materials"],["2310585","Frearson","Mechanics and Materials"],["2311746","Frearson","Mechanics and Materials"],["2312937","Frearson","Mechanics and Materials"],["2313426","Frearson","Mechanics and Materials"],["2308879","Frearson","Mechanics and Materials"],["2309817","Frearson","Mechanics and Materials"],["2311531","Frearson","Mechanics and Materials"],["2312738","Frearson","Mechanics and Materials"],["2313427","Frearson","Mechanics and Materials"]]}
["Local Job Id","Resource","PI Group"]
["965514","Mortorq","Arts"]
["2277129","Frearson","Mechanics and Materials"]
["2278289","Frearson","Mechanics and Materials"]
["2280582","Frearson","Mechanics and Materials"]
["2281719","Frearson","Mechanics and Materials"]
["2283011","Frearson","Mechanics and Materials"]
["2284170","Frearson","Mechanics and Materials"]
["2276367","Frearson","Mechanics and Materials"]
["2277515","Frearson","Mechanics and Materials"]
["2278652","Frearson","Mechanics and Materials"]
["2279817","Frearson","Mechanics and Materials"]
["2283415","Frearson","Mechanics and Materials"]
["2277514","Frearson","Mechanics and Materials"]
["2278288","Frearson","Mechanics and Materials"]
["2279028","Frearson","Mechanics and Materials"]
["2279816","Frearson","Mechanics and Materials"]
["2280583","Frearson","Mechanics and Materials"]
["2283010","Frearson","Mechanics and Materials"]
["2283780","Frearson","Mechanics and Materials"]
["2276029","Frearson","Mechanics and Materials"]
["2279419","Frearson","Mechanics and Materials"]
["2280952","Frearson","Mechanics and Materials"]
["2282190","Frearson","Mechanics and Materials"]
["2284537","Frearson","Mechanics and Materials"]
["2276028","Frearson","Mechanics and Materials"]
["2276742","Frearson","Mechanics and Materials"]
["2281355","Frearson","Mechanics and Materials"]
["2282191","Frearson","Mechanics and Materials"]
["2284538","Frearson","Mechanics and Materials"]
["992569","Mortorq","Arts"]
["992636","Mortorq","Arts"]
["2288365","Frearson","Mechanics and Materials"]
["2291016","Frearson","Mechanics and Materials"]
["2294671","Frearson","Mechanics and Materials"]
["2301876","Frearson","Mechanics and Materials"]
["2305417","Frearson","Mechanics and Materials"]
["2285666","Frearson","Mechanics and Materials"]
["2286842","Frearson","Mechanics and Materials"]
["2292204","Frearson","Mechanics and Materials"]
["2299515","Frearson","Mechanics and Materials"]
["2285268","Frearson","Mechanics and Materials"]
["2286052","Frearson","Mechanics and Materials"]
["2286841","Frearson","Mechanics and Materials"]
["2288364","Frearson","Mechanics and Materials"]
["2292205","Frearson","Mechanics and Materials"]
["2294670","Frearson","Mechanics and Materials"]
["2297063","Frearson","Mechanics and Materials"]
["2299516","Frearson","Mechanics and Materials"]
["2301877","Frearson","Mechanics and Materials"]
["2285269","Frearson","Mechanics and Materials"]
["2286426","Frearson","Mechanics and Materials"]
["2298323","Frearson","Mechanics and Materials"]
["2289247","Frearson","Mechanics and Materials"]
["2295886","Frearson","Mechanics and Materials"]
["2303092","Frearson","Mechanics and Materials"]
["2306562","Frearson","Mechanics and Materials"]
["2290103","Frearson","Mechanics and Materials"]
["2304240","Frearson","Mechanics and Materials"]
["2306563","Frearson","Mechanics and Materials"]
["1004733","Mortorq","Arts"]
["2310438","Frearson","Mechanics and Materials"]
["2312160","Frearson","Mechanics and Materials"]
["2310140","Frearson","Mechanics and Materials"]
["2311056","Frearson","Mechanics and Materials"]
["2312352","Frearson","Mechanics and Materials"]
["2310139","Frearson","Mechanics and Materials"]
["2310437","Frearson","Mechanics and Materials"]
["2310740","Frearson","Mechanics and Materials"]
["2311057","Frearson","Mechanics and Materials"]
["2311929","Frearson","Mechanics and Materials"]
["2312351","Frearson","Mechanics and Materials"]
["2313130","Frearson","Mechanics and Materials"]
["2308880","Frearson","Mechanics and Materials"]
["2309972","Frearson","Mechanics and Materials"]
["2310877","Frearson","Mechanics and Materials"]
["2311530","Frearson","Mechanics and Materials"]
["2312737","Frearson","Mechanics and Materials"]
["2313281","Frearson","Mechanics and Materials"]
["2309580","Frearson","Mechanics and Materials"]
["2310585","Frearson","Mechanics and Materials"]
["2311746","Frearson","Mechanics and Materials"]
["2312937","Frearson","Mechanics and Materials"]
["2313426","Frearson","Mechanics and Materials"]
["2308879","Frearson","Mechanics and Materials"]
["2309817","Frearson","Mechanics and Materials"]
["2311531","Frearson","Mechanics and Materials"]
["2312738","Frearson","Mechanics and Materials"]
["2313427","Frearson","Mechanics and Materials"]
1,313 changes: 1,312 additions & 1 deletion tests/artifacts/xdmod/regression/current/expected/reference/raw-data/jobs-fresh_install.json
View file

Large diffs are not rendered by default.

1,313 changes: 1,312 additions & 1 deletion tests/artifacts/xdmod/regression/current/expected/reference/raw-data/jobs-upgrade.json
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion ...ession/current/expected/reference/raw-data/resourcespecifications-fields-and-filters.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{"success":true,"fields":["Resource ID","Resource"],"data":[["1","Frearson"],["2","Mortorq"]]}
["Resource ID","Resource"]
["1","Frearson"]
["2","Mortorq"]
7 changes: 6 additions & 1 deletion ...rtifacts/xdmod/regression/current/expected/reference/raw-data/resourcespecifications.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
{"success":true,"fields":["Resource ID","Resource","Resource Allocation Type","Start Time","End Time","CPU Processor Count","CPU Node Count","CPU Processors Per Node","GPU Count","GPU Node Count","GPUs Per Node","Normalization Factor","SUs Available","Resource Type","Organization","Percent Allocated"],"data":[["1","Frearson","CPU Allocated","1482796800","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"],["2","Mortorq","GPU Allocated","1482710400","1577923199","4000","400","10","4000","400","10","1.0000",null,"High-performance computing","Screwdriver","100"],["3","Phillips","CPU Node Allocated","1482364800","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"],["4","Posidriv","CPU Allocated","1482278400","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"],["5","Robertson","GPU Node Allocated","1481500800","1577923199","4000","400","10","4000","400","10","1.0000",null,"High-performance computing","Screwdriver","100"]]}
["Resource ID","Resource","Resource Allocation Type","Start Time","End Time","CPU Processor Count","CPU Node Count","CPU Processors Per Node","GPU Count","GPU Node Count","GPUs Per Node","Normalization Factor","SUs Available","Resource Type","Organization","Percent Allocated"]
["1","Frearson","CPU Allocated","1482796800","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"]
["2","Mortorq","GPU Allocated","1482710400","1577923199","4000","400","10","4000","400","10","1.0000",null,"High-performance computing","Screwdriver","100"]
["3","Phillips","CPU Node Allocated","1482364800","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"]
["4","Posidriv","CPU Allocated","1482278400","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"]
["5","Robertson","GPU Node Allocated","1481500800","1577923199","4000","400","10","4000","400","10","1.0000",null,"High-performance computing","Screwdriver","100"]
27 changes: 7 additions & 20 deletions tests/regression/lib/TestHarness/RegressionTestHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,14 +593,12 @@ public function checkRawData($testName, array $input, $sort = false)
$input,
$role
);
$data = str_replace("\x1e", '', $response[0]);
if ($sort) {
array_multisort(
array_column($response[0]['data'], 0),
SORT_ASC,
$response[0]['data']
);
$lines = explode("\n", $data);
sort($lines);
$data = implode("\n", $lines);
}
$data = json_encode($response[0]) . "\n";
$data = preg_replace(self::$replaceRegex, self::$replacements, $data);
if (getenv('REG_TEST_FORCE_GENERATION') === '1') {
return $this->generateArtifact(
Expand Down Expand Up @@ -629,22 +627,11 @@ public function checkRawData($testName, array $input, $sort = false)
if ($expected === $data) {
return true;
}
$differences = [];
self::compareJsonData(
$differences,
'/',
json_decode($expected, true),
json_decode($data, true)
);
throw new \PHPUnit_Framework_ExpectationFailedException(
sprintf(
(
"%d difference"
. (1 === count($differences) ? '' : 's')
. ":\n\t%s"
),
count($differences),
implode("\n\t", $differences)
"Response does not match artifact:\nExpected:\n%s\nActual:\n%s\n",
$expected,
$data
)
);
}
Expand Down

0 comments on commit 2af3dc8

Please sign in to comment.