Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-06-12 10:11:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support PPAs which have fingerprint enabled in them.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-02-13 11:03:59 +01:00
parent 738cac82cf
commit 1848597433
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
britney2/policies/autopkgtest.py
View File

@ -142,6 +142,12 @@ class AutopkgtestPolicy(BasePolicy):
try: try:
self.options.adt_ppas = self.options.adt_ppas.strip().split() self.options.adt_ppas = self.options.adt_ppas.strip().split()
# We also allow, for certain other use-cases, passing the PPA
# fingerprint to for each of the PPAs. This however is not
# currently used by the ADT policy, so get rid of it.
for i, ppa in enumerate(self.options.adt_ppas):
if '@' not in ppa and ':' in ppa:
self.options.adt_ppas[i] = ppa.split(':')[0]
except AttributeError: except AttributeError:
self.options.adt_ppas = [] self.options.adt_ppas = []

26
tests/test_autopkgtest.py
View File

@ -2546,6 +2546,32 @@ class AT(TestAutopkgtestBase):
self.assertEqual(self.amqp_requests, set()) self.assertEqual(self.amqp_requests, set())
self.assertEqual(self.pending_requests, {}) self.assertEqual(self.pending_requests, {})
def test_ppas_fingerprint(self):
'''Run test requests with PPAs where fingerprint is provided'''
self.data.add_default_packages(lightgreen=False)
for line in fileinput.input(self.britney_conf, inplace=True):
if line.startswith('ADT_PPAS'):
print('ADT_PPAS = joe/foo:fingerprint awesome-developers/staging')
else:
sys.stdout.write(line)
exc = self.run_it(
[('lightgreen', {'Version': '2'}, 'autopkgtest')],
{'lightgreen': (True, {'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL'}})},
{'lightgreen': [('old-version', '1'), ('new-version', '2')]}
)[1]
for arch in ['i386', 'amd64']:
self.assertTrue(
('debci-ppa-testing-%s:lightgreen {"triggers": ["lightgreen/2"], '
'"ppas": ["joe/foo", "awesome-developers/staging"]}') % arch in self.amqp_requests or
('debci-ppa-testing-%s:lightgreen {"ppas": ["joe/foo", '
'"awesome-developers/staging"], "triggers": ["lightgreen/2"]}') % arch in self.amqp_requests,
self.amqp_requests)
self.assertEqual(len(self.amqp_requests), 2)
def test_private_ppas(self): def test_private_ppas(self):
'''Run test requests with an additional private PPA''' '''Run test requests with an additional private PPA'''