fixes issue where the tests were trying to connect to productio bodhi during build, keeps %check from failing
did hacky build in copr w/o network, build succeeded
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | libtaskotron/bodhi_utils.py (14 lines) | |||
| M | testing/test_bodhi_utils.py (17 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| bb5012f431d8 | 885d1542d1e3 | 64ecaade17ba | Tim Flink | fixing bodhi_utils to not attempt network on init. Fixes T574 (Show More…) | Aug 18 2015, 9:32 PM |
| Show All 29 Lines | 29 | def __init__(self, client=None): | |||
|---|---|---|---|---|---|
| 30 | '''Create a new BodhiUtils instance. | 30 | '''Create a new BodhiUtils instance. | ||
| 31 | 31 | | |||
| 32 | :param client: custom :class:`BodhiClient` instance. If ``None``, a | 32 | :param client: custom :class:`BodhiClient` instance. If ``None``, a | ||
| 33 | default BodhiClient instance is used. | 33 | default BodhiClient instance is used. | ||
| 34 | ''' | 34 | ''' | ||
| 35 | 35 | | |||
| 36 | self.config = config.get_config() | 36 | self.config = config.get_config() | ||
| 37 | 37 | | |||
| 38 | if not client: | 38 | if client is not None: | ||
| 39 | self._client = client | ||||
| 40 | | ||||
| 41 | @property | ||||
| 42 | def client(self): | ||||
| 43 | if self._client is None: | ||||
| 39 | log.debug('Creating Bodhi client to %s' % self.config.bodhi_server) | 44 | log.debug('Creating Bodhi client to %s' % self.config.bodhi_server) | ||
| 40 | self.client = fedora.client.bodhi.BodhiClient(base_url=self.config.bodhi_server, | 45 | self._client = fedora.client.bodhi.BodhiClient(base_url=self.config.bodhi_server, | ||
| 41 | username=self.config.fas_username, | 46 | username=self.config.fas_username, | ||
| 42 | password=self.config.fas_password) | 47 | password=self.config.fas_password) | ||
| 43 | # automatically retry failed requests (HTTP 5xx and similar) | 48 | # automatically retry failed requests (HTTP 5xx and similar) | ||
| 44 | self.client.retries = 10 | 49 | self._client.retries = 10 | ||
| 45 | else: | 50 | return self._client | ||
| 46 | self.client = client | | |||
| 47 | 51 | | |||
| 48 | def query_update(self, package): | 52 | def query_update(self, package): | ||
| 49 | '''Get the last Bodhi update matching criteria. | 53 | '''Get the last Bodhi update matching criteria. | ||
| 50 | 54 | | |||
| 51 | :param str package: package NVR or package name or update title or | 55 | :param str package: package NVR or package name or update title or | ||
| 52 | update ID | 56 | update ID | ||
| 53 | 57 | | |||
| 54 | .. note:: | 58 | .. note:: | ||
| ▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines | |||||
| 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/bodhi_utils.py''' | 6 | '''Unit tests for libtaskotron/bodhi_utils.py''' | ||
| 7 | 7 | | |||
| 8 | import pytest | 8 | import pytest | ||
| 9 | from dingus import Dingus | 9 | from dingus import Dingus | ||
| 10 | from munch import Munch | 10 | from munch import Munch | ||
| 11 | 11 | | |||
| 12 | from fedora.client import bodhi | ||||
| 13 | | ||||
| 12 | from libtaskotron import bodhi_utils | 14 | from libtaskotron import bodhi_utils | ||
| 13 | from libtaskotron import exceptions as exc | 15 | from libtaskotron import exceptions as exc | ||
| 14 | 16 | | |||
| 15 | 17 | | |||
| 18 | class TestBodhiUtils(): | ||||
| 19 | def test_nonetwork_on_creation(self, monkeypatch): | ||||
| 20 | '''It's important that our stuff not attempt to access the network | ||||
| 21 | during init so that %check doesn't fail during package build. At one | ||||
| 22 | point, BodhiClient did ping bodhi production during init, so let's make | ||||
| 23 | sure that doesn't happen''' | ||||
| 24 | | ||||
| 25 | stub_utils = Dingus() | ||||
| 26 | | ||||
| 27 | monkeypatch.setattr(bodhi, 'BodhiClient', stub_utils) | ||||
| 28 | | ||||
| 29 | bodhi_utils.BodhiUtils() | ||||
| 30 | | ||||
| 31 | assert len(stub_utils.calls()) == 0 | ||||
| 32 | | ||||
| 16 | # FIXME: once query_update() does not throw NotImplementedError | 33 | # FIXME: once query_update() does not throw NotImplementedError | ||
| 17 | # class TestQueryUpdate(): | 34 | # class TestQueryUpdate(): | ||
| 18 | # '''Test query_update()''' | 35 | # '''Test query_update()''' | ||
| 19 | # | 36 | # | ||
| 20 | # def setup_method(self, method): | 37 | # def setup_method(self, method): | ||
| 21 | # '''Run this before every test invocation''' | 38 | # '''Run this before every test invocation''' | ||
| 22 | # self.ref_bodhi_id = 'FEDORA-1234-56789' | 39 | # self.ref_bodhi_id = 'FEDORA-1234-56789' | ||
| 23 | # self.ref_update = {'title': 'Random update', | 40 | # self.ref_update = {'title': 'Random update', | ||
| ▲ Show 20 Lines • Show All 197 Lines • Show Last 20 Lines | |||||