external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FastAPI] include DepArch in dependency list

Browse source 
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-08-30 18:17:14 -07:00
parent a0be018547
commit 1c26ce52a5
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
templates/partials/packages/package_metadata.html
View file

@ -16,6 +16,9 @@
</a> </a>
{% endif %} {% endif %}
{{ dep.Package | provides_list(dep.DepName) | safe }} {{ dep.Package | provides_list(dep.DepName) | safe }}
{% if dep.DepArch %}
<em>({{ dep.DepArch }})</em>
{% endif %}
<!-- If this dependency type is an optdepends (id: 4). --> <!-- If this dependency type is an optdepends (id: 4). -->
{% if dep.DepTypeID == 4 %} {% if dep.DepTypeID == 4 %}
<em>{{ dep | dep_extra_desc }}</em> <em>{{ dep | dep_extra_desc }}</em>

6
test/test_packages_routes.py
View file

@ -228,6 +228,7 @@ def test_package_dependencies(client: TestClient, maintainer: User,
# Create a normal dependency of type depends. # Create a normal dependency of type depends.
dep_pkg = create_package("test-dep-1", maintainer, autocommit=False) dep_pkg = create_package("test-dep-1", maintainer, autocommit=False)
dep = create_package_dep(package, dep_pkg.Name, autocommit=False) dep = create_package_dep(package, dep_pkg.Name, autocommit=False)
dep.DepArch = "x86_64"
# Also, create a makedepends. # Also, create a makedepends.
make_dep_pkg = create_package("test-dep-2", maintainer, autocommit=False) make_dep_pkg = create_package("test-dep-2", maintainer, autocommit=False)
@ -288,6 +289,11 @@ def test_package_dependencies(client: TestClient, maintainer: User,
for i, expectation in enumerate(expected): for i, expectation in enumerate(expected):
assert pkgdeps[i].text.strip() == expectation assert pkgdeps[i].text.strip() == expectation
# Let's make sure the DepArch was displayed for our first dep.
arch = root.findall('.//ul[@id="pkgdepslist"]/li')[0]
arch = arch.xpath('./em')[1]
assert arch.text.strip() == "(x86_64)"
broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span') broken_node = root.find('.//ul[@id="pkgdepslist"]/li/span')
assert broken_node.text.strip() == broken_dep.DepName assert broken_node.text.strip() == broken_dep.DepName