Differential D194

change yumrepoinfo's `supported` to `release_status`
ClosedPublic
Actions

Authored by garretraziel on Jul 24 2014, 10:42 AM.

Details

Reviewers
kparal
tflink
Maniphest Tasks
T283: yumrepoinfo: `supported` key meaning does not match expected upgradepath behavior
Commits
rLTRNcd9dd55b4668: change yumrepoinfo's `supported` to `release_status`
Summary

Change supported with boolean value to more fitting
release_status that can be one of rawhide, stable, branched
or EOL in yumrepoinfo repos configuration.

Test Plan

Run testsuite, upgradepath - had to change /etc/taskotron/yumrepoinfo.conf

Diff Detail

Repository
rLTRN libtaskotron
Lint
Lint Skipped
Unit
Unit Tests Skipped
garretraziel retitled this revision from to change yumrepoinfo's `supported` to `release_status`.Jul 24 2014, 10:42 AM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added a reviewer: kparal.
garretraziel updated this revision to Diff 560.Jul 24 2014, 12:00 PM
  • rebase to master
kparal requested changes to this revision.Jul 25 2014, 11:06 AM

Can you please add a new test to verify that only stable releases are returned using releases(), and that branched() also returns correct values?

Please use case-insensitive comparisons (e.g. EOL should work the same as eol). Put that into a test case.

Thanks.

conf/yumrepoinfo.conf.example
25

I think it would be cleaner if the default section didn't create any release_status default value and required all sections to define it. So, I would leave the documentation (line 25) in place, but move line 26 to the [rawhide] section.

libtaskotron/yumrepoinfo.py
93–94

Can you please add:

:rtype: list of str

to releases() and repos(), and:

:rtype: str or None

to branched()? Thanks.

testing/test_yumrepoinfo.py
25

Don't forget to change these occurrences as well.

This revision now requires changes to proceed.Jul 25 2014, 11:06 AM
garretraziel updated this revision to Diff 564.Jul 29 2014, 8:09 AM
  • changed tests, comments, conf example
kparal accepted this revision.Jul 29 2014, 12:36 PM

Once you fix the documentation it can be pushed.

conf/yumrepoinfo.conf.example
25–27

For non-top-parent repos this is an empty string. Let's document it here.

This revision is now accepted and ready to land.Jul 29 2014, 12:36 PM
garretraziel closed this revision.Jul 29 2014, 2:22 PM
garretraziel updated this revision to Diff 569.

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

Revision Contents

Diff 569

View Options

conf/yumrepoinfo.conf.example

Show All 16 Lines
17arches = i386, x86_64 17​arches = i386, x86_64
18 18​
19# a direct parent of this repo, essential for operations (dependencies) 19​# a direct parent of this repo, essential for operations (dependencies)
20parent = 20​parent =
21 21​
22# koji tag defaults to section name 22​# koji tag defaults to section name
23tag = %(__name__)s 23​tag = %(__name__)s
24 24​
25# true for "top" repos corresponding to currently supported Fedora releases 25​# release_status can be one of: EOL, stable, branched or rawhide
kparalUnsubmitted
Not Done

I think it would be cleaner if the default section didn't create any release_status default value and required all sections to define it. So, I would leave the documentation (line 25) in place, but move line 26 to the [rawhide] section.

26supported = no 26​# for non-top-parent repos this is an empty string
27 27​release_status =
kparalUnsubmitted
Not Done

For non-top-parent repos this is an empty string. Let's document it here.

28 28​
29# Rawhide 29​# Rawhide
30[rawhide] 30​[rawhide]
31url = %(rawhideurl)s 31​url = %(rawhideurl)s
32path = development/rawhide 32​path = development/rawhide
33tag = f22 33​tag = f22
34​release_status = rawhide
34 35​
35# Fedora 21 36​# Fedora 21
36[f21] 37​[f21]
37url = %(rawhideurl)s 38​url = %(rawhideurl)s
38path = development/21 39​path = development/21
39supported = yes 40​release_status = branched
40 41​
41[f21-updates] 42​[f21-updates]
42url = %(updatesurl)s 43​url = %(updatesurl)s
43path = 21 44​path = 21
44parent = f21 45​parent = f21
45 46​
46[f21-updates-testing] 47​[f21-updates-testing]
47url = %(updatesurl)s 48​url = %(updatesurl)s
48path = testing/21 49​path = testing/21
49parent = f21-updates 50​parent = f21-updates
50 51​
51# Fedora 20 52​# Fedora 20
52[f20] 53​[f20]
53url = %(goldurl)s 54​url = %(goldurl)s
54path = 20 55​path = 20
55supported = yes 56​release_status = stable
56 57​
57[f20-updates] 58​[f20-updates]
58url = %(updatesurl)s 59​url = %(updatesurl)s
59path = 20 60​path = 20
60parent = f20 61​parent = f20
61 62​
62[f20-updates-testing] 63​[f20-updates-testing]
63url = %(updatesurl)s 64​url = %(updatesurl)s
64path = testing/20 65​path = testing/20
65parent = f20-updates 66​parent = f20-updates
66 67​
67# Fedora 19 68​# Fedora 19
68[f19] 69​[f19]
69url = %(goldurl)s 70​url = %(goldurl)s
70path = 19 71​path = 19
71supported = yes 72​release_status = stable
72 73​
73[f19-updates] 74​[f19-updates]
74url = %(updatesurl)s 75​url = %(updatesurl)s
75path = 19 76​path = 19
76parent = f19 77​parent = f19
77 78​
78[f19-updates-testing] 79​[f19-updates-testing]
79url = %(updatesurl)s 80​url = %(updatesurl)s
80path = testing/19 81​path = testing/19
81parent = f19-updates 82​parent = f19-updates
82 83​
View Options

libtaskotron/yumrepoinfo.py

Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Line(s)44 def __init__(self, arch=None, filelist=None):
78 if not self.repos(): 78​ if not self.repos():
79 msg = ("No YUM repo definitions found in the following locations: " 79​ msg = ("No YUM repo definitions found in the following locations: "
80 "%s" % self.filelist) 80​ "%s" % self.filelist)
81 log.critical(msg) 81​ log.critical(msg)
82 raise exc.TaskotronConfigError(msg) 82​ raise exc.TaskotronConfigError(msg)
83 83​
84 84​
85 def repos(self): 85​ def repos(self):
86 '''Get the list of all known repository names.''' 86​ '''Get the list of all known repository names.
87​
88​ :rtype: list of str
89​ '''
87 return self.parser.sections() 90​ return self.parser.sections()
88 91​
89 92​
90 def releases(self): 93​ def releases(self):
91 '''Get the list of stable (supported) Fedora releases.''' 94​ '''Get the list of stable (supported) Fedora releases.
kparalUnsubmitted
Not Done

Can you please add:

:rtype: list of str

to releases() and repos(), and:

:rtype: str or None

to branched()? Thanks.

92 return [r for r in self.repos() if self.parser.getboolean(r, 95​
93 'supported')] 96​ :rtype: list of str
97​ '''
98​ return [r for r in self.repos() if self.get(r, 'release_status').lower()
99​ == "stable"]
100​
101​
102​ def branched(self):
103​ '''Get branched Fedora release (or None if it doesn't exist).
104​
105​ :rtype: str or None
106​ '''
107​ for r in self.repos():
108​ if self.get(r, 'release_status').lower() == 'branched':
109​ return r
110​ return None
94 111​
95 112​
96 def arches(self, reponame): 113​ def arches(self, reponame):
97 '''Get the list of all supported architectures for a repo 114​ '''Get the list of all supported architectures for a repo
98 115​
99 :param str reponame: repository name 116​ :param str reponame: repository name
100 ''' 117​ '''
101 return self._getlist(reponame, 'arches') 118​ return self._getlist(reponame, 'arches')
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines
View Options

testing/test_yumrepoinfo.py

Show All 16 Lines
17[DEFAULT] 17​[DEFAULT]
18baseurl = http://download.fedoraproject.org/pub/fedora/linux 18​baseurl = http://download.fedoraproject.org/pub/fedora/linux
19goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os 19​goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os
20updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s 20​updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
21rawhideurl = %(baseurl)s/%(path)s/%(arch)s/os 21​rawhideurl = %(baseurl)s/%(path)s/%(arch)s/os
22arches = i386, x86_64 22​arches = i386, x86_64
23parent = 23​parent =
24tag = %(__name__)s 24​tag = %(__name__)s
25supported = no 25​release_status =
kparalUnsubmitted
Not Done

Don't forget to change these occurrences as well.

26 26​
27[rawhide] 27​[rawhide]
28path = development/rawhide 28​path = development/rawhide
29url = %(rawhideurl)s 29​url = %(rawhideurl)s
30tag = f21 30​tag = f22
31​release_status = rawhide
32​
33​[f21]
34​url = %(rawhideurl)s
35​path = development/21
36​release_status = Branched
31 37​
32[f20] 38​[f20]
33url = %(goldurl)s 39​url = %(goldurl)s
34path = 20 40​path = 20
35supported = yes 41​release_status = STABLE
36 42​
37[f20-updates] 43​[f20-updates]
38url = %(updatesurl)s 44​url = %(updatesurl)s
39path = 20 45​path = 20
40parent = f20 46​parent = f20
41arches = x86_64 47​arches = x86_64
42 48​
43[f20-updates-testing] 49​[f20-updates-testing]
44url = %(updatesurl)s 50​url = %(updatesurl)s
45path = testing/20 51​path = testing/20
46parent = f20-updates 52​parent = f20-updates
53​
54​[f15]
55​url = not_really_an_url
56​path = 15
57​release_status = EOL
47''' 58​'''
48 59​
49 60​
50class TestYumRepoInfo(object): 61​class TestYumRepoInfo(object):
51 62​
52 @classmethod 63​ @classmethod
53 def setup_class(cls): 64​ def setup_class(cls):
54 '''One-time class initialization''' 65​ '''One-time class initialization'''
Show All 32 Lines97 def _raise_alarm(x):
87 assert False, 'This must not be called' 98​ assert False, 'This must not be called'
88 monkeypatch.setattr(ConfigParser.RawConfigParser, 'read', _raise_alarm) 99​ monkeypatch.setattr(ConfigParser.RawConfigParser, 'read', _raise_alarm)
89 100​
90 repoinfo = yumrepoinfo.YumRepoInfo(filelist=[]) 101​ repoinfo = yumrepoinfo.YumRepoInfo(filelist=[])
91 assert not repoinfo.repos() 102​ assert not repoinfo.repos()
92 103​
93 def test_repos(self): 104​ def test_repos(self):
94 '''repos() should return all known repo names''' 105​ '''repos() should return all known repo names'''
95 assert self.repoinfo.repos() == ['rawhide', 'f20', 'f20-updates', 106​ assert self.repoinfo.repos() == ['rawhide', 'f21', 'f20', 'f20-updates',
96 'f20-updates-testing'] 107​ 'f20-updates-testing', 'f15']
97 108​
98 def test_releases(self): 109​ def test_releases(self):
99 '''releases() should return only stable releases repo names''' 110​ '''releases() should return only stable releases repo names'''
100 assert self.repoinfo.releases() == ['f20'] 111​ assert self.repoinfo.releases() == ['f20']
101 112​
113​ def test_branched(self):
114​ '''branched() should return branched release repo name'''
115​ assert self.repoinfo.branched() == 'f21'
116​
102 def test_arches(self): 117​ def test_arches(self):
103 '''arches() should return what's defined in a section''' 118​ '''arches() should return what's defined in a section'''
104 assert self.repoinfo.arches('f20') == ['i386', 'x86_64'] 119​ assert self.repoinfo.arches('f20') == ['i386', 'x86_64']
105 assert self.repoinfo.arches('DEFAULT') == ['i386', 'x86_64'] 120​ assert self.repoinfo.arches('DEFAULT') == ['i386', 'x86_64']
106 assert self.repoinfo.arches('f20-updates') == ['x86_64'] 121​ assert self.repoinfo.arches('f20-updates') == ['x86_64']
107 122​
108 def test_get(self): 123​ def test_get(self):
109 '''get() simply returns a key''' 124​ '''get() simply returns a key'''
110 assert self.repoinfo.get('rawhide', 'supported') == 'no' 125​ assert self.repoinfo.get('rawhide', 'release_status') == 'rawhide'
111 assert self.repoinfo.get('DEFAULT', 'parent') == '' 126​ assert self.repoinfo.get('DEFAULT', 'parent') == ''
112 127​
113 def test_get_raise(self): 128​ def test_get_raise(self):
114 '''get() should raise an error when the key doesn't exist''' 129​ '''get() should raise an error when the key doesn't exist'''
115 with pytest.raises(exc.TaskotronConfigError): 130​ with pytest.raises(exc.TaskotronConfigError):
116 self.repoinfo.get('rawhide', 'non-existent key') 131​ self.repoinfo.get('rawhide', 'non-existent key')
117 132​
118 with pytest.raises(exc.TaskotronConfigError): 133​ with pytest.raises(exc.TaskotronConfigError):
119 self.repoinfo.get('non-existent repo', 'tag') 134​ self.repoinfo.get('non-existent repo', 'tag')
120 135​
121 def test_repo(self): 136​ def test_repo(self):
122 '''repo() returns a repo dict''' 137​ '''repo() returns a repo dict'''
123 rawhide = self.repoinfo.repo('rawhide') 138​ rawhide = self.repoinfo.repo('rawhide')
124 assert rawhide['name'] == 'rawhide' 139​ assert rawhide['name'] == 'rawhide'
125 assert rawhide['tag'] == 'f21' 140​ assert rawhide['tag'] == 'f22'
126 assert set(rawhide.keys()).issuperset( 141​ assert set(rawhide.keys()).issuperset(
127 set(('arches', 'parent', 'tag', 'url', 'path', 'name')) 142​ set(('arches', 'parent', 'tag', 'url', 'path', 'name'))
128 ) 143​ )
129 144​
130 def test_repo_by_tag(self): 145​ def test_repo_by_tag(self):
131 '''repo_by_tag() must work based on tags, not section names''' 146​ '''repo_by_tag() must work based on tags, not section names'''
132 f20up = self.repoinfo.repo_by_tag('f20-updates') 147​ f20up = self.repoinfo.repo_by_tag('f20-updates')
133 assert f20up['name'] == f20up['tag'] == 'f20-updates' 148​ assert f20up['name'] == f20up['tag'] == 'f20-updates'
134 149​
135 f21 = self.repoinfo.repo_by_tag('f21') 150​ f21 = self.repoinfo.repo_by_tag('f22')
136 assert f21['tag'] == 'f21' 151​ assert f21['tag'] == 'f22'
137 assert f21['name'] == 'rawhide' 152​ assert f21['name'] == 'rawhide'
138 153​
139 assert self.repoinfo.repo_by_tag('foobar') is None 154​ assert self.repoinfo.repo_by_tag('foobar') is None
140 155​
141 def test_top_parent(self): 156​ def test_top_parent(self):
142 '''top_parent() must travel the hierarchy''' 157​ '''top_parent() must travel the hierarchy'''
143 assert self.repoinfo.top_parent('rawhide') == 'rawhide' 158​ assert self.repoinfo.top_parent('rawhide') == 'rawhide'
144 assert self.repoinfo.top_parent('f20-updates') == 'f20' 159​ assert self.repoinfo.top_parent('f20-updates') == 'f20'
Show All 31 Lines