Skip to content

Commit 398f7c6

Browse files
jkowalleckjkowalleck
authored
Merge pull request package-url#551 from lizmat/sort-qualifier-keys
Fix tests that didn't have qualifier keys sorted
2 parents 525b142 + c905af5 commit 398f7c6

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎tests/types/conan-test.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
"test_group": "base",
241241
"test_type": "roundtrip",
242242
"input": "pkg:conan/openssl.org/openssl@3.0.3?user=bincrafters&channel=stable",
243-
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?user=bincrafters&channel=stable",
243+
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?channel=stable&user=bincrafters",
244244
"expected_failure": false,
245245
"expected_failure_reason": null
246246
},
@@ -259,7 +259,7 @@
259259
},
260260
"subpath": null
261261
},
262-
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?user=bincrafters&channel=stable",
262+
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?channel=stable&user=bincrafters",
263263
"expected_failure": false,
264264
"expected_failure_reason": null
265265
},
@@ -294,7 +294,7 @@
294294
"test_group": "base",
295295
"test_type": "roundtrip",
296296
"input": "pkg:conan/openssl.org/openssl@3.0.3?arch=x86_64&build_type=Debug&compiler=Visual%20Studio&compiler.runtime=MDd&compiler.version=16&os=Windows&shared=True&rrev=93a82349c31917d2d674d22065c7a9ef9f380c8e&prev=b429db8a0e324114c25ec387bfd8281f330d7c5c",
297-
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?arch=x86_64&build_type=Debug&compiler=Visual%20Studio&compiler.runtime=MDd&compiler.version=16&os=Windows&shared=True&rrev=93a82349c31917d2d674d22065c7a9ef9f380c8e&prev=b429db8a0e324114c25ec387bfd8281f330d7c5c",
297+
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?arch=x86_64&build_type=Debug&compiler=Visual%20Studio&compiler.runtime=MDd&compiler.version=16&os=Windows&prev=b429db8a0e324114c25ec387bfd8281f330d7c5c&rrev=93a82349c31917d2d674d22065c7a9ef9f380c8e&shared=True",
298298
"expected_failure": false,
299299
"expected_failure_reason": null
300300
},
@@ -320,7 +320,7 @@
320320
},
321321
"subpath": null
322322
},
323-
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?arch=x86_64&build_type=Debug&compiler=Visual%20Studio&compiler.runtime=MDd&compiler.version=16&os=Windows&shared=True&rrev=93a82349c31917d2d674d22065c7a9ef9f380c8e&prev=b429db8a0e324114c25ec387bfd8281f330d7c5c",
323+
"expected_output": "pkg:conan/openssl.org/openssl@3.0.3?arch=x86_64&build_type=Debug&compiler=Visual%20Studio&compiler.runtime=MDd&compiler.version=16&os=Windows&prev=b429db8a0e324114c25ec387bfd8281f330d7c5c&rrev=93a82349c31917d2d674d22065c7a9ef9f380c8e&shared=True",
324324
"expected_failure": false,
325325
"expected_failure_reason": null
326326
}

‎tests/types/generic-test.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"test_group": "base",
6767
"test_type": "roundtrip",
6868
"input": "pkg:generic/openssl@1.1.10g?download_url=https://openssl.org/source/openssl-1.1.0g.tar.gz&checksum=sha256:de4d501267da",
69-
"expected_output": "pkg:generic/openssl@1.1.10g?download_url=https://openssl.org/source/openssl-1.1.0g.tar.gz&checksum=sha256:de4d501267da",
69+
"expected_output": "pkg:generic/openssl@1.1.10g?checksum=sha256:de4d501267da&download_url=https://openssl.org/source/openssl-1.1.0g.tar.gz",
7070
"expected_failure": false,
7171
"expected_failure_reason": null
7272
},
@@ -85,7 +85,7 @@
8585
},
8686
"subpath": null
8787
},
88-
"expected_output": "pkg:generic/openssl@1.1.10g?download_url=https://openssl.org/source/openssl-1.1.0g.tar.gz&checksum=sha256:de4d501267da",
88+
"expected_output": "pkg:generic/openssl@1.1.10g?checksum=sha256:de4d501267da&download_url=https://openssl.org/source/openssl-1.1.0g.tar.gz",
8989
"expected_failure": false,
9090
"expected_failure_reason": null
9191
},

‎tests/types/maven-test.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@
737737
"test_group": "base",
738738
"test_type": "roundtrip",
739739
"input": "pkg:maven/org.apache.xmlgraphics/batik-anim@1.9.1?type=zip&classifier=dist",
740-
"expected_output": "pkg:maven/org.apache.xmlgraphics/batik-anim@1.9.1?type=zip&classifier=dist",
740+
"expected_output": "pkg:maven/org.apache.xmlgraphics/batik-anim@1.9.1?classifier=dist&type=zip",
741741
"expected_failure": false,
742742
"expected_failure_reason": null
743743
},
@@ -756,7 +756,7 @@
756756
},
757757
"subpath": null
758758
},
759-
"expected_output": "pkg:maven/org.apache.xmlgraphics/batik-anim@1.9.1?type=zip&classifier=dist",
759+
"expected_output": "pkg:maven/org.apache.xmlgraphics/batik-anim@1.9.1?classifier=dist&type=zip",
760760
"expected_failure": false,
761761
"expected_failure_reason": null
762762
},

‎tests/types/mlflow-test.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
"test_group": "base",
238238
"test_type": "roundtrip",
239239
"input": "pkg:mlflow/trafficsigns@10?model_uuid=36233173b22f4c89b451f1228d700d49&run_id=410a3121-2709-4f88-98dd-dba0ef056b0a&repository_url=https://adb-5245952564735461.0.azuredatabricks.net/api/2.0/mlflow",
240-
"expected_output": "pkg:mlflow/trafficsigns@10?model_uuid=36233173b22f4c89b451f1228d700d49&run_id=410a3121-2709-4f88-98dd-dba0ef056b0a&repository_url=https://adb-5245952564735461.0.azuredatabricks.net/api/2.0/mlflow",
240+
"expected_output": "pkg:mlflow/trafficsigns@10?model_uuid=36233173b22f4c89b451f1228d700d49&repository_url=https://adb-5245952564735461.0.azuredatabricks.net/api/2.0/mlflow&run_id=410a3121-2709-4f88-98dd-dba0ef056b0a",
241241
"expected_failure": false,
242242
"expected_failure_reason": null
243243
},
@@ -257,7 +257,7 @@
257257
},
258258
"subpath": null
259259
},
260-
"expected_output": "pkg:mlflow/trafficsigns@10?model_uuid=36233173b22f4c89b451f1228d700d49&run_id=410a3121-2709-4f88-98dd-dba0ef056b0a&repository_url=https://adb-5245952564735461.0.azuredatabricks.net/api/2.0/mlflow",
260+
"expected_output": "pkg:mlflow/trafficsigns@10?model_uuid=36233173b22f4c89b451f1228d700d49&repository_url=https://adb-5245952564735461.0.azuredatabricks.net/api/2.0/mlflow&run_id=410a3121-2709-4f88-98dd-dba0ef056b0a",
261261
"expected_failure": false,
262262
"expected_failure_reason": null
263263
}

‎tests/types/rpm-test.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"test_group": "base",
130130
"test_type": "roundtrip",
131131
"input": "pkg:rpm/centerim@4.22.10-1.el6?arch=i686&epoch=1&distro=fedora-25",
132-
"expected_output": "pkg:rpm/centerim@4.22.10-1.el6?arch=i686&epoch=1&distro=fedora-25",
132+
"expected_output": "pkg:rpm/centerim@4.22.10-1.el6?arch=i686&distro=fedora-25&epoch=1",
133133
"expected_failure": false,
134134
"expected_failure_reason": null
135135
},
@@ -149,7 +149,7 @@
149149
},
150150
"subpath": null
151151
},
152-
"expected_output": "pkg:rpm/centerim@4.22.10-1.el6?arch=i686&epoch=1&distro=fedora-25",
152+
"expected_output": "pkg:rpm/centerim@4.22.10-1.el6?arch=i686&distro=fedora-25&epoch=1",
153153
"expected_failure": false,
154154
"expected_failure_reason": null
155155
}

0 commit comments

Comments
 (0)