This makes sure we're get notified (an error thrown) if the config files
can't be found or when they don't contain any data. This is related to
discussion in D80.
Tests adjusted.
| Lint Skipped |
| Unit Tests Skipped |
| Path | |||
|---|---|---|---|
| M | libtaskotron/yumrepoinfo.py (14 lines) | ||
| M | testing/functest_yumrepoinfo.py (24 lines) | ||
| M | testing/test_yumrepoinfo.py (4 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 746f1a03552e | a0dca81df41a | 229bff5dd2d7 | Kamil Páral | yumrepoinfo: raise error when config files can't be read (Show More…) | May 7 2014, 12:56 PM |
| Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s) | 41 | def __init__(self, arch=None, filelist=None): | |||
|---|---|---|---|---|---|
| 42 | '''Create YumRepoinfoConfig object. | 42 | '''Create YumRepoinfoConfig object. | ||
| 43 | 43 | | |||
| 44 | @param arch architecture for which to adjust repo URLs. By default it | 44 | @param arch architecture for which to adjust repo URLs. By default it | ||
| 45 | refers to the architecture of the current machine. It's | 45 | refers to the architecture of the current machine. It's | ||
| 46 | always converted to basearch. | 46 | always converted to basearch. | ||
| 47 | @param filelist list of config files to read information from. The first | 47 | @param filelist list of config files to read information from. The first | ||
| 48 | available config file is used. If None, then the default | 48 | available config file is used. If None, then the default | ||
| 49 | list of locations is used. | 49 | list of locations is used. | ||
| 50 | @raise TaskotronConfigError if no YUM repositories data is found (empty | ||||
| 51 | or non-existent config file). It's not | ||||
| 52 | raised if you specifically request no data | ||||
| 53 | to load (filelist=[]). | ||||
| 50 | ''' | 54 | ''' | ||
| 51 | self.arch = rpm_utils.basearch(arch) | 55 | self.arch = rpm_utils.basearch(arch) | ||
| 52 | self.filelist = (filelist if filelist is not None else | 56 | self.filelist = (filelist if filelist is not None else | ||
| 53 | [os.path.join(confdir, 'yumrepoinfo.conf') | 57 | [os.path.join(confdir, 'yumrepoinfo.conf') | ||
| 54 | for confdir in config.CONF_DIRS]) | 58 | for confdir in config.CONF_DIRS]) | ||
| 55 | self.parser = ConfigParser.SafeConfigParser(defaults= | 59 | self.parser = ConfigParser.SafeConfigParser(defaults= | ||
| 56 | {'arch': self.arch}) | 60 | {'arch': self.arch}) | ||
| 57 | 61 | | |||
| 62 | if not self.filelist: | ||||
| 63 | # no data should be loaded | ||||
| 64 | return | ||||
| 65 | | ||||
| 58 | self._read() | 66 | self._read() | ||
| 59 | 67 | | |||
| 60 | if not self.repos(): | 68 | if not self.repos(): | ||
| 61 | log.warn("No repos found in yumrepoinfo config files: %s", | 69 | msg = ("No YUM repo definitions found in the following locations: " | ||
| 62 | self.filelist) | 70 | "%s" % self.filelist) | ||
| 71 | log.critical(msg) | ||||
| 72 | raise exc.TaskotronConfigError(msg) | ||||
| 63 | 73 | | |||
| 64 | 74 | | |||
| 65 | def repos(self): | 75 | def repos(self): | ||
| 66 | '''Get the list of all known repository names.''' | 76 | '''Get the list of all known repository names.''' | ||
| 67 | return self.parser.sections() | 77 | return self.parser.sections() | ||
| 68 | 78 | | |||
| 69 | 79 | | |||
| 70 | def releases(self): | 80 | def releases(self): | ||
| ▲ Show 20 Lines • Show All 103 Lines • Show Last 20 Lines | |||||
| Show All 10 Lines | |||||
| 11 | 11 | | |||
| 12 | class TestYumRepoInfo(object): | 12 | class TestYumRepoInfo(object): | ||
| 13 | 13 | | |||
| 14 | def test_init_filelist(self, tmpdir): | 14 | def test_init_filelist(self, tmpdir): | ||
| 15 | '''test YumRepoInfo(filelist=) with custom config files''' | 15 | '''test YumRepoInfo(filelist=) with custom config files''' | ||
| 16 | conf1 = tmpdir.join('conf1.cfg') | 16 | conf1 = tmpdir.join('conf1.cfg') | ||
| 17 | conf2 = tmpdir.join('conf2.cfg') | 17 | conf2 = tmpdir.join('conf2.cfg') | ||
| 18 | conf1.write(''' | 18 | conf1.write(''' | ||
| 19 | [DEFAULT] | 19 | [rawhide] | ||
| 20 | a = foo''') | 20 | a = foo''') | ||
| 21 | conf2.write(''' | 21 | conf2.write(''' | ||
| 22 | [DEFAULT] | 22 | [rawhide] | ||
| 23 | b = bar''') | 23 | b = bar''') | ||
| 24 | repoinfo = yumrepoinfo.YumRepoInfo(filelist=[conf1.strpath, | 24 | repoinfo = yumrepoinfo.YumRepoInfo(filelist=[conf1.strpath, | ||
| 25 | conf2.strpath]) | 25 | conf2.strpath]) | ||
| 26 | 26 | | |||
| 27 | # must read conf1 | 27 | # must read conf1 | ||
| 28 | assert repoinfo.get('DEFAULT', 'a') == 'foo' | 28 | assert repoinfo.get('rawhide', 'a') == 'foo' | ||
| 29 | 29 | | |||
| 30 | # must not read conf2 | 30 | # must not read conf2 | ||
| 31 | with pytest.raises(exc.TaskotronConfigError): | 31 | with pytest.raises(exc.TaskotronConfigError): | ||
| 32 | repoinfo.get('DEFAULT', 'b') | 32 | repoinfo.get('rawhide', 'b') | ||
| 33 | 33 | | |||
| 34 | # must not read default configs | 34 | # must not read default configs | ||
| 35 | with pytest.raises(exc.TaskotronConfigError): | 35 | with pytest.raises(exc.TaskotronConfigError): | ||
| 36 | repoinfo.get('DEFAULT', 'tag') | 36 | repoinfo.get('rawhide', 'tag') | ||
| 37 | | ||||
| 38 | def test_init_raise(self, tmpdir): | ||||
| 39 | '''Raise an exception when configs don't exist or are empty''' | ||||
| 40 | conf1 = tmpdir.join('conf1.cfg') | ||||
| 41 | conf2 = tmpdir.join('conf2.cfg') | ||||
| 42 | conf2.write('') | ||||
| 43 | | ||||
| 44 | # non-existent | ||||
| 45 | with pytest.raises(exc.TaskotronConfigError): | ||||
| 46 | yumrepoinfo.YumRepoInfo(filelist=[conf1.strpath]) | ||||
| 47 | | ||||
| 48 | # empty | ||||
| 49 | with pytest.raises(exc.TaskotronConfigError): | ||||
| 50 | yumrepoinfo.YumRepoInfo(filelist=[conf2.strpath]) | ||||
| Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s) | 49 | class TestYumRepoInfo(object): | |||
|---|---|---|---|---|---|
| 65 | 65 | | |||
| 66 | @pytest.fixture | 66 | @pytest.fixture | ||
| 67 | def clean_singleton(self, monkeypatch): | 67 | def clean_singleton(self, monkeypatch): | ||
| 68 | '''Replace singleton container with an empty dict''' | 68 | '''Replace singleton container with an empty dict''' | ||
| 69 | monkeypatch.setattr(yumrepoinfo, '_yumrepoinfo', {}) | 69 | monkeypatch.setattr(yumrepoinfo, '_yumrepoinfo', {}) | ||
| 70 | 70 | | |||
| 71 | def test_init_arch(self, disable_disk_loading): | 71 | def test_init_arch(self, disable_disk_loading): | ||
| 72 | '''test YumRepoInfo(arch=)''' | 72 | '''test YumRepoInfo(arch=)''' | ||
| 73 | repoinfo = yumrepoinfo.YumRepoInfo(arch='x86_64') | 73 | repoinfo = yumrepoinfo.YumRepoInfo(arch='x86_64', filelist=[]) | ||
| 74 | repoinfo.parser.readfp(StringIO.StringIO(TEST_CONF)) | 74 | repoinfo.parser.readfp(StringIO.StringIO(TEST_CONF)) | ||
| 75 | assert '/x86_64/' in repoinfo.get('rawhide', 'goldurl') | 75 | assert '/x86_64/' in repoinfo.get('rawhide', 'goldurl') | ||
| 76 | 76 | | |||
| 77 | # i686 should be converted to i386 | 77 | # i686 should be converted to i386 | ||
| 78 | repoinfo = yumrepoinfo.YumRepoInfo(arch='i686') | 78 | repoinfo = yumrepoinfo.YumRepoInfo(arch='i686', filelist=[]) | ||
| 79 | repoinfo.parser.readfp(StringIO.StringIO(TEST_CONF)) | 79 | repoinfo.parser.readfp(StringIO.StringIO(TEST_CONF)) | ||
| 80 | assert '/i386/' in repoinfo.get('rawhide', 'goldurl') | 80 | assert '/i386/' in repoinfo.get('rawhide', 'goldurl') | ||
| 81 | 81 | | |||
| 82 | def test_init_empty_filelist(self, monkeypatch): | 82 | def test_init_empty_filelist(self, monkeypatch): | ||
| 83 | '''YumRepoInfo(filelist=[]) should not load anything from disk''' | 83 | '''YumRepoInfo(filelist=[]) should not load anything from disk''' | ||
| 84 | # make sure the disk is not read | 84 | # make sure the disk is not read | ||
| 85 | def _raise_alarm(x): | 85 | def _raise_alarm(x): | ||
| 86 | assert False, 'This must not be called' | 86 | assert False, 'This must not be called' | ||
| ▲ Show 20 Lines • Show All 88 Lines • Show Last 20 Lines | |||||