Differential D383

Add distgit directive
ClosedPublic
Actions

Authored by mkrizek on Jun 10 2015, 8:56 AM.

Details

Reviewers
kparal
tflink
jskladan
Maniphest Tasks
T492: support downloading a file from current package's dist-git
Commits
rLTRNb9c3644b5131: Add distgit directive
Test Plan

Tests added.

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Add distgit directive.Jun 10 2015, 8:56 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, kparal, jskladan.
kparal requested changes to this revision.Jun 10 2015, 11:49 AM

Thanks for the patch. There are some minor documentation issues. My main concern is about the automatic branch switching. I'm not sure how to do that reliably without asking an external service (koji) for more information. Or we could support just master (or a different branch per maintainer's choice), but that's somewhat limited.

libtaskotron/directives/distgit_directive.py
13

Not everyone might be familiar with Fedora distgit. I would clarify it:

Download files from Fedora package repository (usually called 'distgit') hosted at http://pkgs.fedoraproject.org/ . Any files hosted at that directory can be downloaded for a chosen package.

17

It would be nice to support both N(E)VR and N (package name). Because if I write a generic check that runs for every package, I'll probably use NEVR (that would be the item from a koji_build event). If I write a task that is specific for pidgin and runs only on new pidgin builds, or runs daily or something, I might want to hardcode pidgin as the package name - either for better readability, or because item will be used for something else.

21

This seems to have been written with just a single file in mind, and then later extended to a list of files, but documentation was not adjusted. Can it also download a directory? Not clear.

22

list of str?

25

This seems to have been written with just a single file in mind, and then later extended to a list of files, but documentation was not adjusted.

It should also explain what the default behavior is when the localpath parameter is not given.

26

list of str?

34–35

These two should be the same error, TaskotronValueError. It's an invalid input, in both cases.

53

workdir is not defined in the parameters documentation.

75–79

I see now why you want to know release of the build, because you automatically switch branches. But that is not documented at all. Please document it, thanks. When only a package name is used, master should be used (and/or offer a parameter to override that).

Unfortunately, I'm afraid the current implementation will not work. It will break with:

  • epel builds
  • builds with 1.fc22.1 release (which is allowed)
  • builds with no fcXX in release (which is allowed, try rpm -q fedora-release)
  • .fc21 builds in Fedora 22, because there hasn't been any mass rebuild for F22, so fc21 packages are completely fine and ubiquitous in F22

How to fix it? Hmm, not sure. The only reliable way seems to be to query koji and find out which tag this package has been built against (or is pushed in, not sure which one is better way). Which is unfortunate, can't be done offline. But I have no better idea, at the moment :-/

80

A note: If we want to support directory downloads, we will probably need to go from http to git protocol.

87

This is a bit misleading, there is no "download" action, because this directive has no action parameter. A slight rephrasing will fix this :)

89–91

This is a bit more complicated, because python_utils.iterable() checks that the object is iterable, but also not a string. I would simply say:

"Incorrect value type of the 'path' parameter: %s" % type(input_data['path']))

The documentation says clearly what is supported (list of str).

98–99

Ditto as for path.

This revision now requires changes to proceed.Jun 10 2015, 11:49 AM
mkrizek updated this revision to Diff 1097.Jul 3 2015, 1:36 PM
  • Address issues mentioned in the review
mkrizek updated this revision to Diff 1100.Jul 7 2015, 7:44 AM
  • Add test for rpm_utils.get_dist_tag
tflink accepted this revision.Jul 8 2015, 4:25 AM
kparal accepted this revision.Jul 8 2015, 8:23 AM

A few notes added, but in general it looks good. Please adjust the documentation and the unit test before committing, though, thanks.

libtaskotron/directives/distgit_directive.py
13

I had a typo in there, s/directory/repository :-)

17

Please document that package disttag determines the git branch used for file download.

21

The example should probably be:['xchat.spec']

25

Example probably ['specs/xchat.spec']

libtaskotron/rpm_utils.py
102

If you want to make it simpler, you can call this simply dist_tag().

108

It would be great if you could include an example, because it's not immediately clear if the returned string contains the leading dot or not (the rpm macro contains it).

testing/test_rpm_utils.py
129–133

Could you add a test which throws an exception on an unsupported dist tag? E.g. el7 :-)

This revision is now accepted and ready to land.Jul 8 2015, 8:23 AM
Closed by commit rLTRNb9c3644b5131: Add distgit directive (authored by mkrizek). · Explain WhyJul 8 2015, 2:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1113

View Options

libtaskotron/directives/distgit_directive.py

  • This file was added.
1​# -*- coding: utf-8 -*-
2​# Copyright 2009-2015, Red Hat, Inc.
3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4​# See the LICENSE file for more details on Licensing
5​
6​from __future__ import absolute_import
7​
8​DOCUMENTATION = """
9​module: distgit_directive
10​short_description: download files from distgit
11​description: |
12​ Download files from Fedora package repository (usually called 'distgit') hosted at http://pkgs.fedoraproject.org/. Any files hosted at that repository can be downloaded for a chosen package.
13​parameters:
kparalUnsubmitted
Not Done

Not everyone might be familiar with Fedora distgit. I would clarify it:

Download files from Fedora package repository (usually called 'distgit') hosted at http://pkgs.fedoraproject.org/ . Any files hosted at that directory can be downloaded for a chosen package.

kparalUnsubmitted
Not Done

I had a typo in there, s/directory/repository :-)

14​ package:
15​ required: true
16​ description: N(E)VR of a package. Package' dist tag determines the git branch used for file download. Example: ``xchat-2.8.8-21.fc20``
17​ type: str
kparalUnsubmitted
Not Done

It would be nice to support both N(E)VR and N (package name). Because if I write a generic check that runs for every package, I'll probably use NEVR (that would be the item from a koji_build event). If I write a task that is specific for pidgin and runs only on new pidgin builds, or runs daily or something, I might want to hardcode pidgin as the package name - either for better readability, or because item will be used for something else.

kparalUnsubmitted
Not Done

Please document that package disttag determines the git branch used for file download.

18​ path:
19​ required: true
20​ description: files (directories not supported at the moment) to be downloaded from distgit. Example: ``[xchat.spec]``
21​ type: list of str
kparalUnsubmitted
Not Done

This seems to have been written with just a single file in mind, and then later extended to a list of files, but documentation was not adjusted. Can it also download a directory? Not clear.

kparalUnsubmitted
Not Done

The example should probably be:['xchat.spec']

22​ localpath:
kparalUnsubmitted
Not Done

list of str?

23​ required: false
24​ description: a local path of downloaded file. If not provided, path from distgit will be used. Example: ``[specs/xchat.spec]``
25​ type: list of str
kparalUnsubmitted
Not Done

This seems to have been written with just a single file in mind, and then later extended to a list of files, but documentation was not adjusted.

It should also explain what the default behavior is when the localpath parameter is not given.

kparalUnsubmitted
Not Done

Example probably ['specs/xchat.spec']

26​ target_dir:
kparalUnsubmitted
Not Done

list of str?

27​ required: false
28​ description: directory into which to download files
29​ type: str
30​ default: ${workdir}
31​returns: |
32​ A dictionary containing following items:
33​
34​ * `downloaded_files`: (list of str) a list of local filenames of the downloaded
35​ files
kparalUnsubmitted
Not Done

These two should be the same error, TaskotronValueError. It's an invalid input, in both cases.

36​raises: |
37​ * :class:`.TaskotronRemoteError`: if downloading failed
38​ * :class:`.TaskotronValueError`: if path and localpath are not lists or are not of the same length
39​ * :class:`.TaskotronDirectiveError`: if package or path is missing
40​version_added: 0.3.16
41​"""
42​
43​EXAMPLES = """
44​A task needs to download a spec file and httpd configuration check to run a check
45​on those files::
46​
47​ - name: download spec file and httpd conf
48​ distgit:
49​ package: yourls-1.7-3.20150410gitabc7d6c.fc22
50​ path:
51​ - yourls.spec
52​ - yourls-httpd.conf
53​ localpath:
kparalUnsubmitted
Not Done

workdir is not defined in the parameters documentation.

54​ - download/yourls_downloaded.spec
55​ - download/yourls-httpd_downloaded.conf
56​"""
57​
58​import os.path
59​
60​from libtaskotron.directives import BaseDirective
61​from libtaskotron import file_utils, rpm_utils, python_utils
62​import libtaskotron.exceptions as exc
63​
64​directive_class = 'DistGitDirective'
65​
66​URL_FMT = 'http://pkgs.fedoraproject.org/cgit/%s.git/plain/%s?h=%s'
67​
68​
69​class DistGitDirective(BaseDirective):
70​ def __init__(self):
71​ super(DistGitDirective, self).__init__()
72​
73​ def _download_file(self, package, path, localpath):
74​ pkgname = rpm_utils.rpmformat(package, fmt='n')
75​ dist_tag = rpm_utils.get_dist_tag(package)
76​ # fc22 -> f22 conversion, since that's how branches are called
77​ branch = dist_tag.replace('c', '')
78​ url = URL_FMT % (pkgname, path, branch)
79​
kparalUnsubmitted
Not Done

I see now why you want to know release of the build, because you automatically switch branches. But that is not documented at all. Please document it, thanks. When only a package name is used, master should be used (and/or offer a parameter to override that).

Unfortunately, I'm afraid the current implementation will not work. It will break with:

  • epel builds
  • builds with 1.fc22.1 release (which is allowed)
  • builds with no fcXX in release (which is allowed, try rpm -q fedora-release)
  • .fc21 builds in Fedora 22, because there hasn't been any mass rebuild for F22, so fc21 packages are completely fine and ubiquitous in F22

How to fix it? Hmm, not sure. The only reliable way seems to be to query koji and find out which tag this package has been built against (or is pushed in, not sure which one is better way). Which is unfortunate, can't be done offline. But I have no better idea, at the moment :-/

80​ return file_utils.download(url, '.', localpath)
kparalUnsubmitted
Not Done

A note: If we want to support directory downloads, we will probably need to go from http to git protocol.

81​
82​ def process(self, input_data, env_data):
83​ if 'package' not in input_data or 'path' not in input_data:
84​ detected_args = ', '.join(input_data.keys())
85​ raise exc.TaskotronDirectiveError(
86​ "The distgit directive requires 'package' and 'path' arguments."
87​ "Detected arguments: %s" % detected_args)
kparalUnsubmitted
Not Done

This is a bit misleading, there is no "download" action, because this directive has no action parameter. A slight rephrasing will fix this :)

88​
89​ if 'target_dir' not in input_data:
90​ target_dir = env_data['workdir']
91​ else:
kparalUnsubmitted
Not Done

This is a bit more complicated, because python_utils.iterable() checks that the object is iterable, but also not a string. I would simply say:

"Incorrect value type of the 'path' parameter: %s" % type(input_data['path']))

The documentation says clearly what is supported (list of str).

92​ target_dir = input_data['target_dir']
93​
94​ if not python_utils.iterable(input_data['path']):
95​ raise exc.TaskotronValueError("Incorrect value type of the 'path' argument: "
96​ "%s" % type(input_data['path']))
97​
98​ target_path = input_data['path']
99​ output_data = {}
kparalUnsubmitted
Not Done

Ditto as for path.

100​
101​ if 'localpath' in input_data:
102​ if not python_utils.iterable(input_data['localpath']):
103​ raise exc.TaskotronValueError("Incorrect value type of the 'localpath' argument: "
104​ "%s" % type(input_data['path']))
105​
106​ if not len(input_data['path']) == len(input_data['localpath']):
107​ raise exc.TaskotronValueError('path and localpath lists must be of the same '
108​ 'length.')
109​
110​ target_path = input_data['localpath']
111​
112​
113​ output_data['downloaded_files'] = []
114​ for path, localpath in zip(input_data['path'], target_path):
115​ localpath = os.path.join(target_dir, localpath)
116​ file_utils.makedirs(os.path.dirname(localpath))
117​ output_data['downloaded_files'].append(
118​ self._download_file(input_data['package'], path, localpath)
119​ )
120​
121​ return output_data
View Options

libtaskotron/rpm_utils.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6''' Utility methods related to RPM ''' 6​''' Utility methods related to RPM '''
7 7​
8from __future__ import absolute_import 8​from __future__ import absolute_import
9import os 9​import re
10import hawkey 10​import hawkey
11 11​
12from libtaskotron import exceptions as exc 12​from libtaskotron import exceptions as exc
13 13​
14 14​
15def rpmformat(rpmstr, fmt='nvr', end_arch=False): 15​def rpmformat(rpmstr, fmt='nvr', end_arch=False):
16 ''' 16​ '''
17 Parse and convert an RPM package version string into a different format. 17​ Parse and convert an RPM package version string into a different format.
Show All 18 Lines
36 :return: string based on the specified format, or integer if ``fmt='e'`` 36​ :return: string based on the specified format, or integer if ``fmt='e'``
37 :raise TaskotronValueError: if ``fmt`` value is not supported 37​ :raise TaskotronValueError: if ``fmt`` value is not supported
38 ''' 38​ '''
39 fmt = fmt.lower() 39​ fmt = fmt.lower()
40 supported_formats = ['nvr', 'nevr', 'nvra', 'nevra', 40​ supported_formats = ['nvr', 'nevr', 'nvra', 'nevra',
41 'n', 'e', 'v', 'r', 'a'] 41​ 'n', 'e', 'v', 'r', 'a']
42 if fmt not in supported_formats: 42​ if fmt not in supported_formats:
43 raise exc.TaskotronValueError("Format '%s' not in supported formats " 43​ raise exc.TaskotronValueError("Format '%s' not in supported formats "
44 "(%s)" % (fmt, ', '.join(supported_formats))) 44​ "(%s)" % (fmt, ', '.join(supported_formats)))
45 45​
46 # add arch if not present 46​ # add arch if not present
47 if not end_arch: 47​ if not end_arch:
48 rpmstr += '.noarch' 48​ rpmstr += '.noarch'
49 49​
50 # split rpmstr 50​ # split rpmstr
51 nevra = hawkey.split_nevra(rpmstr) 51​ nevra = hawkey.split_nevra(rpmstr)
52 52​
Show All 31 Lines76def cmpNEVR(nevr1, nevr2):
84 :raise TaskotronValueError: if name in ``nevr1`` doesn't match name in 84​ :raise TaskotronValueError: if name in ``nevr1`` doesn't match name in
85 ``nevr2`` 85​ ``nevr2``
86 ''' 86​ '''
87 rpmver1 = hawkey.split_nevra(nevr1 + '.noarch') 87​ rpmver1 = hawkey.split_nevra(nevr1 + '.noarch')
88 rpmver2 = hawkey.split_nevra(nevr2 + '.noarch') 88​ rpmver2 = hawkey.split_nevra(nevr2 + '.noarch')
89 89​
90 if rpmver1.name != rpmver2.name: 90​ if rpmver1.name != rpmver2.name:
91 raise exc.TaskotronValueError("Name in nevr1 doesn't match name in " 91​ raise exc.TaskotronValueError("Name in nevr1 doesn't match name in "
92 "nevr2: %s, %s" % (nevr1, nevr2)) 92​ "nevr2: %s, %s" % (nevr1, nevr2))
93 93​
94 # sack is needed for the comparison, because it can be influence the 94​ # sack is needed for the comparison, because it can be influence the
95 # comparison (for example epoch can be set to be ignored). A default empty 95​ # comparison (for example epoch can be set to be ignored). A default empty
96 # sack should match Fedora customs 96​ # sack should match Fedora customs
97 sack = hawkey.Sack() 97​ sack = hawkey.Sack()
98 98​
99 return rpmver1.evr_cmp(rpmver2, sack) 99​ return rpmver1.evr_cmp(rpmver2, sack)
100​
101​
102​def get_dist_tag(rpmstr):
kparalUnsubmitted
Not Done

If you want to make it simpler, you can call this simply dist_tag().

103​ '''Parse disttag from an RPM package version string.
104​
105​ :param str rpmstr: string to be manipulated in a format of N(E)VR
106​ (``foo-1.2-3.fc20`` or ``bar-4:1.2-3.fc20``) or N(E)VRA
107​ (``foo-1.2-3.fc20.x86_64`` or ``bar-4:1.2-3.fc20.i686``)
108​ :return: string containing dist tag (``fc20``)
kparalUnsubmitted
Not Done

It would be great if you could include an example, because it's not immediately clear if the returned string contains the leading dot or not (the rpm macro contains it).

109​ :raise TaskotronValueError: if ``rpmstr`` does not contain dist tag
110​ '''
111​
112​ release = rpmformat(rpmstr, 'r')
113​ matches = re.findall(r'\.(fc\d{1,2})\.?', release)
114​ if not matches:
115​ raise exc.TaskotronValueError('Could not parse disttag from %s' % rpmstr)
116​
117​ # there might be e.g. fc22 in git commit hash as part of the release,
118​ # so just take the last match which should be disttag
119​ return matches[-1]
View Options

testing/test_distgit_directive.py

  • This file was added.
1​# -*- coding: utf-8 -*-
2​# Copyright 2009-2015, Red Hat, Inc.
3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4​# See the LICENSE file for more details on Licensing
5​
6​import os.path
7​import pytest
8​from dingus import Dingus
9​
10​from libtaskotron import file_utils
11​from libtaskotron.directives import distgit_directive
12​import libtaskotron.exceptions as exc
13​
14​
15​class TestDistGitDirective():
16​ def setup_method(self, method):
17​ self.ref_nvr = 'foo-1.2-3.fc99'
18​ self.ref_path = ['foo.spec']
19​ self.ref_localpath = ['local.foo.spec']
20​ self.ref_branch = 'f99'
21​ self.ref_envdata = {'workdir': '/var/tmp/foo'}
22​ self.helper = distgit_directive.DistGitDirective()
23​
24​ def _get_url(self, path):
25​ return distgit_directive.URL_FMT % ('foo', path, self.ref_branch)
26​
27​ def test_parse_download_command(self, monkeypatch):
28​ ref_input = {'action': 'download',
29​ 'package': self.ref_nvr,
30​ 'path': self.ref_path}
31​
32​ monkeypatch.setattr(file_utils, 'download', Dingus())
33​
34​ self.helper.process(ref_input, self.ref_envdata)
35​
36​ download_calls = file_utils.download.calls
37​
38​ assert len(download_calls) == 1
39​ assert download_calls[0][1][0] == self._get_url(self.ref_path[0])
40​ assert download_calls[0][1][2] == os.path.join(self.ref_envdata['workdir'], self.ref_path[0])
41​
42​ def test_parse_download_command_localpath(self, monkeypatch):
43​ ref_input = {'action': 'download',
44​ 'package': self.ref_nvr,
45​ 'path': self.ref_path,
46​ 'localpath': self.ref_localpath}
47​
48​ monkeypatch.setattr(file_utils, 'download', Dingus())
49​
50​ self.helper.process(ref_input, self.ref_envdata)
51​
52​ download_calls = file_utils.download.calls
53​
54​ assert len(download_calls) == 1
55​ assert download_calls[0][1][0] == self._get_url(self.ref_path[0])
56​ assert download_calls[0][1][2] == os.path.join(self.ref_envdata['workdir'], self.ref_localpath[0])
57​
58​ def test_parse_download_command_multiple_localpath(self, monkeypatch):
59​ ref_path = ['file1', 'file2']
60​ ref_localpath = ['file3', 'file4']
61​ ref_input = {'action': 'download',
62​ 'package': self.ref_nvr,
63​ 'path': ref_path,
64​ 'localpath': ref_localpath}
65​
66​ monkeypatch.setattr(file_utils, 'download', Dingus())
67​
68​ self.helper.process(ref_input, self.ref_envdata)
69​
70​ download_calls = file_utils.download.calls
71​
72​ assert len(download_calls) == 2
73​ assert download_calls[0][1][0] == self._get_url(ref_path[0])
74​ assert download_calls[1][1][0] == self._get_url(ref_path[1])
75​ assert download_calls[0][1][2] == os.path.join(self.ref_envdata['workdir'], ref_localpath[0])
76​ assert download_calls[1][1][2] == os.path.join(self.ref_envdata['workdir'], ref_localpath[1])
77​
78​ def test_parse_download_command_incorrect_localpath(self):
79​ ref_path = ['file1', 'file2']
80​ ref_localpath = ['file3']
81​ ref_input = {'action': 'download',
82​ 'package': self.ref_nvr,
83​ 'path': ref_path,
84​ 'localpath': ref_localpath}
85​
86​ with pytest.raises(exc.TaskotronValueError):
87​ self.helper.process(ref_input, self.ref_envdata)
88​
89​ def test_parse_download_command_incorrect_path_str(self):
90​ ref_path = 'file1'
91​ ref_input = {'action': 'download',
92​ 'package': self.ref_nvr,
93​ 'path': ref_path}
94​
95​ with pytest.raises(exc.TaskotronValueError):
96​ self.helper.process(ref_input, self.ref_envdata)
97​
98​ def test_parse_download_command_incorrect_localpath_str(self):
99​ ref_localpath = 'file2'
100​ ref_input = {'action': 'download',
101​ 'package': self.ref_nvr,
102​ 'path': self.ref_path,
103​ 'localpath': ref_localpath}
104​
105​ with pytest.raises(exc.TaskotronValueError):
106​ self.helper.process(ref_input, self.ref_envdata)
107​
108​ def test_parse_download_command_missing_package(self):
109​ ref_input = {'action': 'download',
110​ 'path': self.ref_path}
111​
112​ with pytest.raises(exc.TaskotronDirectiveError):
113​ self.helper.process(ref_input, self.ref_envdata)
114​
115​ def test_parse_download_command_missing_path(self):
116​ ref_input = {'action': 'download',
117​ 'package': self.ref_nvr}
118​
119​ with pytest.raises(exc.TaskotronDirectiveError):
120​ self.helper.process(ref_input, self.ref_envdata)
View Options

testing/test_rpm_utils.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6'''Unit tests for libtaskotron/rpm_utils.py''' 6​'''Unit tests for libtaskotron/rpm_utils.py'''
7 7​
8import pytest 8​import pytest
9 9​
10from libtaskotron.rpm_utils import rpmformat, cmpNEVR 10​from libtaskotron.rpm_utils import rpmformat, cmpNEVR, get_dist_tag
11from libtaskotron import exceptions as exc 11​from libtaskotron import exceptions as exc
12 12​
13 13​
14class TestRpmformat: 14​class TestRpmformat:
15 15​
16 def test_nvra(self): 16​ def test_nvra(self):
17 '''NVRA as input param''' 17​ '''NVRA as input param'''
18 rpmstr = 'foo-1.2-3.fc20.x86_64' 18​ rpmstr = 'foo-1.2-3.fc20.x86_64'
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s)116 def test_some_epoch(self):
119 assert cmpNEVR('foo-1:1.2-3.fc20', 'foo-2.2-3.fc20') == 1 119​ assert cmpNEVR('foo-1:1.2-3.fc20', 'foo-2.2-3.fc20') == 1
120 assert cmpNEVR('foo-0:1.2-3.fc20', 'foo-1.2-3.fc20') == 0 120​ assert cmpNEVR('foo-0:1.2-3.fc20', 'foo-1.2-3.fc20') == 0
121 assert cmpNEVR('foo-1.2-3.fc20', 'foo-2:0.1-1.fc19') == -1 121​ assert cmpNEVR('foo-1.2-3.fc20', 'foo-2:0.1-1.fc19') == -1
122 122​
123 def test_raise(self): 123​ def test_raise(self):
124 '''Invalid input param''' 124​ '''Invalid input param'''
125 with pytest.raises(exc.TaskotronValueError): 125​ with pytest.raises(exc.TaskotronValueError):
126 cmpNEVR('foo-1.2-3.fc20', 'bar-1.2-3.fc20') 126​ cmpNEVR('foo-1.2-3.fc20', 'bar-1.2-3.fc20')
127​
128​class TestGetDistTag(object):
129​ def test_nvrs(self):
130​ assert get_dist_tag('foo-1.2-3.fc20') == 'fc20'
131​ assert get_dist_tag('foo-1.2-3.fc20.1') == 'fc20'
132​ assert get_dist_tag('foo-1.2-3.fc22hashgit.fc20') == 'fc20'
133​ assert get_dist_tag('foo-1.2-3.fc22hashgit.fc20.1') == 'fc20'
kparalUnsubmitted
Not Done

Could you add a test which throws an exception on an unsupported dist tag? E.g. el7 :-)

134​
135​ def test_unsupported_dist_tag(self):
136​ with pytest.raises(exc.TaskotronValueError):
137​ get_dist_tag('foo-1.2-3.el7')