Skip to content

Commit 285c98c

Browse files
portanteportante
committed
Stabilize unit tests sorting index report
The indexer searches for tar balls to index using `glob.iglob`, which will return tar balls names in different orders depending on how the tar balls were created in the directory on some systems. Sorting the output stabilizes the gold files to avoid unwanted differences in the tests.
1 parent b27f783 commit 285c98c

28 files changed

+102
-102
lines changed

‎server/bin/gold/test-5.2.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ len(actions) = 1
212212
"chunk_id": 1,
213213
"doctype": "status",
214214
"name": "pbench-index",
215-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 0 results, skipped 7 results\n\nSkipped Results\n===============\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-b-with-prefixes/TO-INDEX/tarball-0_YYYY.MM.DDTHH.MM.SS.tar.xz\n\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-g-normal/TO-INDEX/tarball-normal_YYYY.MM.DDTHH.MM.SS.tar.xz\n\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/ONE::controllerB/TO-INDEX/tarball-simple2_YYYY-MM-DDTHH-mm-ss.tar.xz\n\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/ONE::controllerA/TO-INDEX/tarball-simple1_YYYY-MM-DDTHH-mm-ss.tar.xz\n\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-b-with-prefixes/TO-INDEX/tarball-w-dot-prefix_YYYY.MM.DDTHH.MM.SS.tar.xz\n\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-b-with-prefixes/TO-INDEX/tarball-w-prefix-dot_YYYY.MM.DDTHH.MM.SS.tar.xz\n\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/ONE::controllerC/TO-INDEX/tarball-simple0-prefix_YYYY-MM-DDTHH-mm-ss.tar.xz\n\n",
215+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 0 results, skipped 7 results\n\nSkipped Results\n===============\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/ONE::controllerA/TO-INDEX/tarball-simple1_YYYY-MM-DDTHH-mm-ss.tar.xz\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/ONE::controllerB/TO-INDEX/tarball-simple2_YYYY-MM-DDTHH-mm-ss.tar.xz\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/ONE::controllerC/TO-INDEX/tarball-simple0-prefix_YYYY-MM-DDTHH-mm-ss.tar.xz\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-b-with-prefixes/TO-INDEX/tarball-0_YYYY.MM.DDTHH.MM.SS.tar.xz\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-b-with-prefixes/TO-INDEX/tarball-w-dot-prefix_YYYY.MM.DDTHH.MM.SS.tar.xz\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-b-with-prefixes/TO-INDEX/tarball-w-prefix-dot_YYYY.MM.DDTHH.MM.SS.tar.xz\n/var/tmp/pbench-test-server/test-5.2/pbench/archive/fs-version-001/controller-g-normal/TO-INDEX/tarball-normal_YYYY.MM.DDTHH.MM.SS.tar.xz\n",
216216
"total_chunks": 1,
217-
"total_size": 1115
217+
"total_size": 1108
218218
},
219219
"_type": "pbench-server-reports"
220220
}

‎server/bin/gold/test-7.1.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ len(actions) = 1
9292
"chunk_id": 1,
9393
"doctype": "status",
9494
"name": "pbench-index",
95-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 0 results, skipped 1 results\n\nSkipped Results\n===============\n/var/tmp/pbench-test-server/test-7.1/pbench/archive/fs-version-001/controller/TO-INDEX/test-7.1.tar.xz\n\n",
95+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 0 results, skipped 1 results\n\nSkipped Results\n===============\n/var/tmp/pbench-test-server/test-7.1/pbench/archive/fs-version-001/controller/TO-INDEX/test-7.1.tar.xz\n",
9696
"total_chunks": 1,
97-
"total_size": 217
97+
"total_size": 216
9898
},
9999
"_type": "pbench-server-reports"
100100
}

‎server/bin/gold/test-7.10.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,9 +1492,9 @@ len(actions) = 1
14921492
"chunk_id": 1,
14931493
"doctype": "status",
14941494
"name": "pbench-index",
1495-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.10/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX/uperf_uperftest_2018.02.02T20.58.00.tar.xz\n\n",
1495+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.10/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX/uperf_uperftest_2018.02.02T20.58.00.tar.xz\n",
14961496
"total_chunks": 1,
1497-
"total_size": 225
1497+
"total_size": 224
14981498
},
14991499
"_type": "pbench-server-reports"
15001500
}
@@ -9798,9 +9798,9 @@ len(actions) = 1
97989798
"chunk_id": 1,
97999799
"doctype": "status",
98009800
"name": "pbench-index-tool-data",
9801-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.10/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX-TOOL/uperf_uperftest_2018.02.02T20.58.00.tar.xz\n\n",
9801+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.10/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX-TOOL/uperf_uperftest_2018.02.02T20.58.00.tar.xz\n",
98029802
"total_chunks": 1,
9803-
"total_size": 240
9803+
"total_size": 239
98049804
},
98059805
"_type": "pbench-server-reports"
98069806
}

‎server/bin/gold/test-7.11.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,9 +1379,9 @@ len(actions) = 1
13791379
"chunk_id": 1,
13801380
"doctype": "status",
13811381
"name": "pbench-index",
1382-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.11/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX/fio_rw_2018.02.01T22.40.57.tar.xz\n\n",
1382+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.11/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX/fio_rw_2018.02.01T22.40.57.tar.xz\n",
13831383
"total_chunks": 1,
1384-
"total_size": 216
1384+
"total_size": 215
13851385
},
13861386
"_type": "pbench-server-reports"
13871387
}
@@ -5325,9 +5325,9 @@ len(actions) = 1
53255325
"chunk_id": 1,
53265326
"doctype": "status",
53275327
"name": "pbench-index-tool-data",
5328-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.11/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX-TOOL/fio_rw_2018.02.01T22.40.57.tar.xz\n\n",
5328+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.11/pbench/archive/fs-version-001/dhcp31-44/TO-INDEX-TOOL/fio_rw_2018.02.01T22.40.57.tar.xz\n",
53295329
"total_chunks": 1,
5330-
"total_size": 231
5330+
"total_size": 230
53315331
},
53325332
"_type": "pbench-server-reports"
53335333
}

‎server/bin/gold/test-7.12.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2041,9 +2041,9 @@ len(actions) = 1
20412041
"chunk_id": 1,
20422042
"doctype": "status",
20432043
"name": "pbench-index",
2044-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.12/pbench/archive/fs-version-001/EC2::ip-172-31-52-154/TO-INDEX/pbench-user-benchmark__2018.02.05T20.35.36.tar.xz\n\n",
2044+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.12/pbench/archive/fs-version-001/EC2::ip-172-31-52-154/TO-INDEX/pbench-user-benchmark__2018.02.05T20.35.36.tar.xz\n",
20452045
"total_chunks": 1,
2046-
"total_size": 244
2046+
"total_size": 243
20472047
},
20482048
"_type": "pbench-server-reports"
20492049
}
@@ -4265,9 +4265,9 @@ len(actions) = 1
42654265
"chunk_id": 1,
42664266
"doctype": "status",
42674267
"name": "pbench-index-tool-data",
4268-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.12/pbench/archive/fs-version-001/EC2::ip-172-31-52-154/TO-INDEX-TOOL/pbench-user-benchmark__2018.02.05T20.35.36.tar.xz\n\n",
4268+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.12/pbench/archive/fs-version-001/EC2::ip-172-31-52-154/TO-INDEX-TOOL/pbench-user-benchmark__2018.02.05T20.35.36.tar.xz\n",
42694269
"total_chunks": 1,
4270-
"total_size": 259
4270+
"total_size": 258
42714271
},
42724272
"_type": "pbench-server-reports"
42734273
}

‎server/bin/gold/test-7.13.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5193,9 +5193,9 @@ len(actions) = 1
51935193
"chunk_id": 1,
51945194
"doctype": "status",
51955195
"name": "pbench-index",
5196-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.13/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n\n",
5196+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.13/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n",
51975197
"total_chunks": 1,
5198-
"total_size": 250
5198+
"total_size": 249
51995199
},
52005200
"_type": "pbench-server-reports"
52015201
}
@@ -10767,9 +10767,9 @@ len(actions) = 1
1076710767
"chunk_id": 1,
1076810768
"doctype": "status",
1076910769
"name": "pbench-index-tool-data",
10770-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.13/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX-TOOL/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n\n",
10770+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.13/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX-TOOL/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n",
1077110771
"total_chunks": 1,
10772-
"total_size": 265
10772+
"total_size": 264
1077310773
},
1077410774
"_type": "pbench-server-reports"
1077510775
}

‎server/bin/gold/test-7.14.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6425,9 +6425,9 @@ len(actions) = 1
64256425
"chunk_id": 1,
64266426
"doctype": "status",
64276427
"name": "pbench-index",
6428-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.14/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n\n",
6428+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.14/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n",
64296429
"total_chunks": 1,
6430-
"total_size": 250
6430+
"total_size": 249
64316431
},
64326432
"_type": "pbench-server-reports"
64336433
}
@@ -7742,9 +7742,9 @@ len(actions) = 1
77427742
"chunk_id": 1,
77437743
"doctype": "status",
77447744
"name": "pbench-index-tool-data",
7745-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.14/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX-TOOL/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n\n",
7745+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.14/pbench/archive/fs-version-001/b03-h01-1029p/TO-INDEX-TOOL/pbench-user-benchmark_mbruzek-test-2_2018.04.10T19.01.19.tar.xz\n",
77467746
"total_chunks": 1,
7747-
"total_size": 265
7747+
"total_size": 264
77487748
},
77497749
"_type": "pbench-server-reports"
77507750
}

‎server/bin/gold/test-7.15.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,9 +2082,9 @@ len(actions) = 1
20822082
"chunk_id": 1,
20832083
"doctype": "status",
20842084
"name": "pbench-index",
2085-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.15/pbench/archive/fs-version-001/master_40gb/TO-INDEX/uperf__2016-10-06_16:34:03.tar.xz\n\n",
2085+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.15/pbench/archive/fs-version-001/master_40gb/TO-INDEX/uperf__2016-10-06_16:34:03.tar.xz\n",
20862086
"total_chunks": 1,
2087-
"total_size": 218
2087+
"total_size": 217
20882088
},
20892089
"_type": "pbench-server-reports"
20902090
}
@@ -8424,9 +8424,9 @@ len(actions) = 1
84248424
"chunk_id": 1,
84258425
"doctype": "status",
84268426
"name": "pbench-index-tool-data",
8427-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.15/pbench/archive/fs-version-001/master_40gb/TO-INDEX-TOOL/uperf__2016-10-06_16:34:03.tar.xz\n\n",
8427+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.15/pbench/archive/fs-version-001/master_40gb/TO-INDEX-TOOL/uperf__2016-10-06_16:34:03.tar.xz\n",
84288428
"total_chunks": 1,
8429-
"total_size": 233
8429+
"total_size": 232
84308430
},
84318431
"_type": "pbench-server-reports"
84328432
}

‎server/bin/gold/test-7.16.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,9 +1549,9 @@ len(actions) = 1
15491549
"chunk_id": 1,
15501550
"doctype": "status",
15511551
"name": "pbench-index",
1552-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.16/pbench/archive/fs-version-001/rhel8-4/TO-INDEX/uperf_rhel8_4.18.0-18.el8_40gb_pass_2018.10.04T06.53.43.tar.xz\n\n",
1552+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.16/pbench/archive/fs-version-001/rhel8-4/TO-INDEX/uperf_rhel8_4.18.0-18.el8_40gb_pass_2018.10.04T06.53.43.tar.xz\n",
15531553
"total_chunks": 1,
1554-
"total_size": 243
1554+
"total_size": 242
15551555
},
15561556
"_type": "pbench-server-reports"
15571557
}
@@ -10029,9 +10029,9 @@ len(actions) = 1
1002910029
"chunk_id": 1,
1003010030
"doctype": "status",
1003110031
"name": "pbench-index-tool-data",
10032-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.16/pbench/archive/fs-version-001/rhel8-4/TO-INDEX-TOOL/uperf_rhel8_4.18.0-18.el8_40gb_pass_2018.10.04T06.53.43.tar.xz\n\n",
10032+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.16/pbench/archive/fs-version-001/rhel8-4/TO-INDEX-TOOL/uperf_rhel8_4.18.0-18.el8_40gb_pass_2018.10.04T06.53.43.tar.xz\n",
1003310033
"total_chunks": 1,
10034-
"total_size": 258
10034+
"total_size": 257
1003510035
},
1003610036
"_type": "pbench-server-reports"
1003710037
}

‎server/bin/gold/test-7.17.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -861,9 +861,9 @@ len(actions) = 1
861861
"chunk_id": 1,
862862
"doctype": "status",
863863
"name": "pbench-index",
864-
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.17/pbench/archive/fs-version-001/ansible-host/TO-INDEX/pbench-user-benchmark_example-vmstat_2018.10.24T14.38.18.tar.xz\n\n",
864+
"text": "pbench-index.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.17/pbench/archive/fs-version-001/ansible-host/TO-INDEX/pbench-user-benchmark_example-vmstat_2018.10.24T14.38.18.tar.xz\n",
865865
"total_chunks": 1,
866-
"total_size": 249
866+
"total_size": 248
867867
},
868868
"_type": "pbench-server-reports"
869869
}
@@ -3469,9 +3469,9 @@ len(actions) = 1
34693469
"chunk_id": 1,
34703470
"doctype": "status",
34713471
"name": "pbench-index-tool-data",
3472-
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.17/pbench/archive/fs-version-001/ansible-host/TO-INDEX-TOOL/pbench-user-benchmark_example-vmstat_2018.10.24T14.38.18.tar.xz\n\n",
3472+
"text": "pbench-index-tool-data.run-1970-01-01T00:00:00-UTC - Indexed 1 results\n\nIndexed Results\n===============\n/var/tmp/pbench-test-server/test-7.17/pbench/archive/fs-version-001/ansible-host/TO-INDEX-TOOL/pbench-user-benchmark_example-vmstat_2018.10.24T14.38.18.tar.xz\n",
34733473
"total_chunks": 1,
3474-
"total_size": 264
3474+
"total_size": 263
34753475
},
34763476
"_type": "pbench-server-reports"
34773477
}

0 commit comments

Comments
 (0)