Instead return the input repo name, if there's no parent. This is what
callers usually want, instead of None handling.
Tests adjusted.
| Lint Skipped |
| Unit Tests Skipped |
@tflink, this is needed for upgradepath to work, so it needs to be packaged and installed on the staging server.
| Path | |||
|---|---|---|---|
| M | libtaskotron/yumrepoinfo.py (11 lines) | ||
| M | testing/test_yumrepoinfo.py (2 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 579a4be7ebb5 | 8e64d751c81c | 19ecb3b07648 | Kamil Páral | yumrepoinfo: top_parent() should not return None (Show More…) | Apr 29 2014, 8:57 AM |
| Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Line(s) | 120 | for r in self.repos(): | |||
|---|---|---|---|---|---|
| 121 | if self.get(r,'tag') == tag: | 121 | if self.get(r,'tag') == tag: | ||
| 122 | return self.repo(r) | 122 | return self.repo(r) | ||
| 123 | 123 | | |||
| 124 | 124 | | |||
| 125 | def top_parent(self, reponame): | 125 | def top_parent(self, reponame): | ||
| 126 | '''Go through the repo hiearchy and find the top parent for a repo | 126 | '''Go through the repo hiearchy and find the top parent for a repo | ||
| 127 | 127 | | |||
| 128 | @param reponame repository name | 128 | @param reponame repository name | ||
| 129 | @return the top parent reponame, or None if there is no parent at all | 129 | @return the top parent reponame. If @param reponame doesn't have any | ||
| 130 | parent, its name is returned (it's its own top parent) | ||||
| 130 | @throw TaskotronConfigError if infinite parent loop detected | 131 | @throw TaskotronConfigError if infinite parent loop detected | ||
| 131 | ''' | 132 | ''' | ||
| 132 | parents = [] | 133 | parents = [] | ||
| 133 | repo = reponame | 134 | repo = reponame | ||
| 134 | 135 | | |||
| 135 | while True: | 136 | while True: | ||
| 136 | parent = self.get(repo, 'parent') | 137 | parent = self.get(repo, 'parent') | ||
| 137 | 138 | | |||
| 138 | if not parent: | 139 | if not parent: | ||
| 139 | if repo is reponame: | 140 | # we've found the top parent | ||
| 140 | # there is no parent at all, return None | 141 | return repo | ||
| 141 | return None | | |||
| 142 | else: | | |||
| 143 | # we've found at least one parent | | |||
| 144 | return repo | | |||
| 145 | 142 | | |||
| 146 | # detect infinite parent loops | 143 | # detect infinite parent loops | ||
| 147 | if parent in parents: | 144 | if parent in parents: | ||
| 148 | raise exc.TaskotronConfigError('Infinite parent loop detected ' | 145 | raise exc.TaskotronConfigError('Infinite parent loop detected ' | ||
| 149 | 'in yumrepoinfo: %s' % parents) | 146 | 'in yumrepoinfo: %s' % parents) | ||
| 150 | 147 | | |||
| 151 | parents.append(parent) | 148 | parents.append(parent) | ||
| 152 | repo = parent | 149 | repo = parent | ||
| Show All 24 Lines | |||||
| Show First 20 Lines • Show All 133 Lines • ▼ Show 20 Line(s) | 129 | def test_repo_by_tag(self): | |||
|---|---|---|---|---|---|
| 134 | f21 = self.repoinfo.repo_by_tag('f21') | 134 | f21 = self.repoinfo.repo_by_tag('f21') | ||
| 135 | assert f21['tag'] == 'f21' | 135 | assert f21['tag'] == 'f21' | ||
| 136 | assert f21['name'] == 'rawhide' | 136 | assert f21['name'] == 'rawhide' | ||
| 137 | 137 | | |||
| 138 | assert self.repoinfo.repo_by_tag('foobar') is None | 138 | assert self.repoinfo.repo_by_tag('foobar') is None | ||
| 139 | 139 | | |||
| 140 | def test_top_parent(self): | 140 | def test_top_parent(self): | ||
| 141 | '''top_parent() must travel the hierarchy''' | 141 | '''top_parent() must travel the hierarchy''' | ||
| 142 | assert self.repoinfo.top_parent('rawhide') is None | 142 | assert self.repoinfo.top_parent('rawhide') == 'rawhide' | ||
| 143 | assert self.repoinfo.top_parent('f20-updates') == 'f20' | 143 | assert self.repoinfo.top_parent('f20-updates') == 'f20' | ||
| 144 | assert self.repoinfo.top_parent('f20-updates-testing') == 'f20' | 144 | assert self.repoinfo.top_parent('f20-updates-testing') == 'f20' | ||
| 145 | 145 | | |||
| 146 | def test_top_parent_raise(self): | 146 | def test_top_parent_raise(self): | ||
| 147 | '''top_parent() must detect an infinite parent cycle''' | 147 | '''top_parent() must detect an infinite parent cycle''' | ||
| 148 | cfg = '''\ | 148 | cfg = '''\ | ||
| 149 | [repo1] | 149 | [repo1] | ||
| 150 | parent = repo2 | 150 | parent = repo2 | ||
| Show All 24 Lines | |||||