From ea2b51f29f9510da87d193fe12ac37d19ed4f51b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 3 Jan 2022 11:37:46 +0100 Subject: Enable tests commented out with no longer true fixme Pinning and its display was reworked years ago, but the test and especially the comment never got the memo. References: a91aae406112df1d8fe16d00212333a20210f674 Gbp-Dch: Ignore --- test/integration/test-policy-pinning | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning index 6cb89ed38..fccef6da3 100755 --- a/test/integration/test-policy-pinning +++ b/test/integration/test-policy-pinning @@ -157,9 +157,8 @@ testequalpolicycoolstuff "" "1.0" 500 990 600 "" -o Test=RegexPin -t stable echo "Package: coolstuff Pin: release n=backports Pin-Priority: 200" > rootdir/etc/apt/preferences -#FIXME: policy can't differentiate between two sources where one has a package specific pin in place -# testequalpolicycoolstuff "" "1.0" 500 500 200 "2.0~bpo1" -o Test=PackagePin -# testequalpolicycoolstuff "" "1.0" 990 500 200 "2.0~bpo1" -o Test=PackagePin -t backports +testequalpolicycoolstuff "" "1.0" 500 500 200 "2.0~bpo1" -o Test=PackagePin +testequalpolicycoolstuff "" "1.0" 990 500 200 "2.0~bpo1" -o Test=PackagePin -t backports testequalpolicycoolstuff "" "1.0" 500 990 200 "2.0~bpo1" -o Test=PackagePin -t stable echo "Package: coolstuff Pin: release n=backports @@ -171,9 +170,9 @@ testequalpolicycoolstuff "" "2.0~bpo1" 990 500 600 "2.0~bpo1" -o Test=PackagePin echo "Package: coolstuff Pin: release n=backports Pin-Priority: -1" > rootdir/etc/apt/preferences -# testequalpolicycoolstuff "" "1.0" 500 500 -1 "2.0~bpo1" -o Test=PackagePin -# testequalpolicycoolstuff "" "1.0" 990 500 -1 "2.0~bpo1" -o Test=PackagePin -t backports -# testequalpolicycoolstuff "" "1.0" 500 990 -1 "2.0~bpo1" -o Test=PackagePin -t stable +testequalpolicycoolstuff "" "1.0" 500 500 -1 "2.0~bpo1" -o Test=PackagePin +testequalpolicycoolstuff "" "1.0" 990 500 -1 "2.0~bpo1" -o Test=PackagePin -t backports +testequalpolicycoolstuff "" "1.0" 500 990 -1 "2.0~bpo1" -o Test=PackagePin -t stable rm rootdir/etc/apt/preferences sed -i aptarchive/dists/backports/Release -e 1i"NotAutomatic: yes" -- cgit v1.2.3-70-g09d2