Differential D222

exclude "-debuginfo-" in koji_utils too
ClosedPublic
Actions

Authored by garretraziel on Aug 26 2014, 12:14 PM.

Details

Reviewers
lbrabec
kparal
Maniphest Tasks
T315: koji_utils: debuginfo filter should exclude more packages
Commits
rLTRN69ccadebaa3b: exclude "-debuginfo-" in koji_utils when debuginfo=False
Summary

Exclude also '-debuginfo-' if debuginfo=False is
specified in nvr_to_urls.

Test Plan

py.test -F testing/

Diff Detail

Repository
rLTRN libtaskotron
Lint
Lint Skipped
Unit
Unit Tests Skipped
garretraziel retitled this revision from to exclude "-debuginfo-" in koji_utils too.Aug 26 2014, 12:14 PM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added reviewers: kparal, lbrabec.
kparal accepted this revision.Aug 27 2014, 8:22 AM

Make the change and push, thanks.

testing/test_koji_utils.py
174–178

Can you please move this to a separate method (something like test_nvr_to_urls_debuginfo)? Thanks.

This revision is now accepted and ready to land.Aug 27 2014, 8:22 AM
garretraziel closed this revision.Aug 27 2014, 8:33 AM
garretraziel updated this revision to Diff 637.

Closed by commit rLTRN69ccadebaa3b (authored by Garret Raziel <boloomka@gmail.com>).

Revision Contents

PathPackages
Mlibtaskotron/koji_utils.py (3 lines)
Mtesting/test_koji_utils.py (19 lines)

Diff 637

View Options

libtaskotron/koji_utils.py

Show First 20 Lines • Show All 147 Lines • ▼ Show 20 Line(s)110 def nvr_to_urls(self, nvr, arches=['all'], debuginfo=False, src=True):
148 if info is None: 148​ if info is None:
149 raise exc.TaskotronRemoteError( 149​ raise exc.TaskotronRemoteError(
150 "No such build found in Koji: %s" % nvr) 150​ "No such build found in Koji: %s" % nvr)
151 151​
152 # list its RPM files 152​ # list its RPM files
153 req_arches = None if 'all' in arches else arches 153​ req_arches = None if 'all' in arches else arches
154 rpms = self.session.listRPMs(buildID=info['id'], arches=req_arches) 154​ rpms = self.session.listRPMs(buildID=info['id'], arches=req_arches)
155 if not debuginfo: 155​ if not debuginfo:
156 rpms = [r for r in rpms if not r['name'].endswith('-debuginfo')] 156​ rpms = [r for r in rpms if (not r['name'].endswith('-debuginfo'))
157​ and ('-debuginfo-' not in r['name'])]
157 if not src: 158​ if not src:
158 rpms = [r for r in rpms if not r['arch'] == 'src'] 159​ rpms = [r for r in rpms if not r['arch'] == 'src']
159 160​
160 # create URLs 161​ # create URLs
161 baseurl = '/'.join((config.get_config().pkg_url, info['package_name'], 162​ baseurl = '/'.join((config.get_config().pkg_url, info['package_name'],
162 info['version'], info['release'])) 163​ info['version'], info['release']))
163 urls = ['%s/%s' % (baseurl, koji.pathinfo.rpm(r)) for r in rpms] 164​ urls = ['%s/%s' % (baseurl, koji.pathinfo.rpm(r)) for r in rpms]
164 165​
▲ Show 20 Lines • Show All 77 Lines • Show Last 20 Lines
View Options

testing/test_koji_utils.py

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)40 self.ref_build = {'package_name': self.ref_name,
42 'release': self.ref_release, 42​ 'release': self.ref_release,
43 'id': self.ref_buildid} 43​ 'id': self.ref_buildid}
44 44​
45 self.ref_rpms = [{'name': self.ref_name, 'version': self.ref_version, 45​ self.ref_rpms = [{'name': self.ref_name, 'version': self.ref_version,
46 'release': self.ref_release, 'nvr': self.ref_nvr, 46​ 'release': self.ref_release, 'nvr': self.ref_nvr,
47 'arch': self.ref_arch, 'build_id': self.ref_buildid,}, 47​ 'arch': self.ref_arch, 'build_id': self.ref_buildid,},
48 {'name': self.ref_name, 'version': self.ref_version, 48​ {'name': self.ref_name, 'version': self.ref_version,
49 'release': self.ref_release, 'nvr': self.ref_nvr, 49​ 'release': self.ref_release, 'nvr': self.ref_nvr,
50​ 'arch': 'src', 'build_id': self.ref_buildid, },
51​ {'name': self.ref_name + '-debuginfo',
52​ 'version': self.ref_version,
53​ 'release': self.ref_release, 'nvr': self.ref_nvr,
54​ 'arch': 'src', 'build_id': self.ref_buildid, },
55​ {'name': self.ref_name + '-debuginfo-common',
56​ 'version': self.ref_version,
57​ 'release': self.ref_release, 'nvr': self.ref_nvr,
50 'arch': 'src', 'build_id': self.ref_buildid, }] 58​ 'arch': 'src', 'build_id': self.ref_buildid, }]
51 59​
52 def test_rpms_to_build(self): 60​ def test_rpms_to_build(self):
53 stub_koji = Dingus(getBuild__returns=None, 61​ stub_koji = Dingus(getBuild__returns=None,
54 getRPM__returns=None, 62​ getRPM__returns=None,
55 multiCall=create_multicall( 63​ multiCall=create_multicall(
56 [[self.ref_rpms[0]], [self.ref_rpms[1]]], 64​ [[self.ref_rpms[0]], [self.ref_rpms[1]]],
57 [[self.ref_build], [self.ref_build]])) 65​ [[self.ref_build], [self.ref_build]]))
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s)158 def test_nvr_to_urls_src_filtering(self):
158 assert 'src' in urls[0] or 'src' in urls[1] 166​ assert 'src' in urls[0] or 'src' in urls[1]
159 167​
160 # arch enabled, src disabled 168​ # arch enabled, src disabled
161 urls = test_koji.nvr_to_urls(self.ref_nvr, arches=[self.ref_arch], 169​ urls = test_koji.nvr_to_urls(self.ref_nvr, arches=[self.ref_arch],
162 src=False) 170​ src=False)
163 assert len(urls) == 1 171​ assert len(urls) == 1
164 assert 'src' not in urls[0] 172​ assert 'src' not in urls[0]
165 173​
174​ def test_nvr_to_urls_debuginfo(self):
175​ stub_koji = Dingus(getBuild__returns=self.ref_build,
176​ listRPMs__returns=self.ref_rpms)
177​ test_koji = koji_utils.KojiClient(stub_koji)
178​
kparalUnsubmitted
Not Done

Can you please move this to a separate method (something like test_nvr_to_urls_debuginfo)? Thanks.

179​ # arch enabled, src enabled, debuginfo enabled
180​ urls = test_koji.nvr_to_urls(self.ref_nvr, arches=[self.ref_arch],
181​ debuginfo=True)
182​ assert len(urls) == 4
183​ assert len([url for url in urls if '-debuginfo' in url]) == 2
184​
166 def test_nvr_to_urls_only_src(self): 185​ def test_nvr_to_urls_only_src(self):
167 stub_koji = Dingus(getBuild__returns=self.ref_build) 186​ stub_koji = Dingus(getBuild__returns=self.ref_build)
168 test_koji = koji_utils.KojiClient(stub_koji) 187​ test_koji = koji_utils.KojiClient(stub_koji)
169 188​
170 # arch disabled, src enabled 189​ # arch disabled, src enabled
171 test_koji.nvr_to_urls(self.ref_nvr, arches=[], src=True) 190​ test_koji.nvr_to_urls(self.ref_nvr, arches=[], src=True)
172 listrpm_calls = stub_koji.calls('listRPMs') 191​ listrpm_calls = stub_koji.calls('listRPMs')
173 requested_arches = listrpm_calls[0][2]['arches'] 192​ requested_arches = listrpm_calls[0][2]['arches']
Show All 31 Lines