diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py index 1f590a1e..24e4933c 100644 --- a/test/test_packages_routes.py +++ b/test/test_packages_routes.py @@ -455,13 +455,13 @@ def test_package_dependencies(client: TestClient, maintainer: User, # And... a checkdepends! check_dep_pkg = create_package("test-dep-3", maintainer) - check_dep = create_package_dep(package, check_dep_pkg.Name, - dep_type_name="checkdepends") + create_package_dep(package, check_dep_pkg.Name, + dep_type_name="checkdepends") # Geez. Just stop. This is optdepends. opt_dep_pkg = create_package("test-dep-4", maintainer) - opt_dep = create_package_dep(package, opt_dep_pkg.Name, - dep_type_name="optdepends") + create_package_dep(package, opt_dep_pkg.Name, + dep_type_name="optdepends") # Heh. Another optdepends to test one with a description. opt_desc_dep_pkg = create_package("test-dep-5", maintainer) @@ -475,7 +475,7 @@ def test_package_dependencies(client: TestClient, maintainer: User, # Create an official provider record. db.create(OfficialProvider, Name="test-dep-99", Repo="core", Provides="test-dep-99") - official_dep = create_package_dep(package, "test-dep-99") + create_package_dep(package, "test-dep-99") # Also, create a provider who provides our test-dep-99. provider = create_package("test-provider", maintainer) @@ -485,25 +485,25 @@ def test_package_dependencies(client: TestClient, maintainer: User, resp = request.get(package_endpoint(package)) assert resp.status_code == int(HTTPStatus.OK) + # Let's make sure all the non-broken deps are ordered as we expect. + expected = list(filter( + lambda e: e.is_package(), + package.package_dependencies.order_by( + PackageDependency.DepTypeID.asc(), + PackageDependency.DepName.asc() + ).all() + )) root = parse_root(resp.text) - - expected = [ - dep.DepName, - make_dep.DepName, - check_dep.DepName, - opt_dep.DepName, - opt_desc_dep.DepName, - official_dep.DepName - ] pkgdeps = root.findall('.//ul[@id="pkgdepslist"]/li/a') - for i, expectation in enumerate(reversed(expected)): - assert pkgdeps[i].text.strip() == expectation + for i, expectation in enumerate(expected): + assert pkgdeps[i].text.strip() == expectation.DepName # Let's make sure the DepArch was displayed for our target make dep. - arch = root.findall('.//ul[@id="pkgdepslist"]/li')[-2] + arch = root.findall('.//ul[@id="pkgdepslist"]/li')[3] arch = arch.xpath('./em')[0] assert arch.text.strip() == "(make, x86_64)" + # And let's make sure that the broken package was displayed. broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span') assert broken_node.text.strip() == broken_dep.DepName