Merge branch 'master' into ridad

Also, fix tests.
This commit is contained in:
Ralph Bean
2016-07-27 13:34:32 -04:00
4 changed files with 15 additions and 11 deletions

View File

@@ -35,15 +35,17 @@ class TestModuleWait(unittest.TestCase):
@mock.patch('rida.builder.KojiModuleBuilder')
@mock.patch('rida.database.ModuleBuild.from_module_event')
@mock.patch('rida.pdc.get_pdc_client_session')
def test_wait_basic(self, pdc, from_module_event, KojiModuleBuilder):
@mock.patch('rida.pdc')
def test_init_basic(self, pdc, from_module_event, KojiModuleBuilder):
builder = mock.Mock()
builder.get_disttag_srpm.return_value = 'some srpm disttag'
KojiModuleBuilder.return_value = builder
mocked_module_build = mock.Mock()
mocked_module_build.json.return_value = {
'name': 'foo',
'version': 1,
'release': 1,
'state': 'some state',
}
from_module_event.return_value = mocked_module_build
@@ -51,6 +53,7 @@ class TestModuleWait(unittest.TestCase):
'topic': 'org.fedoraproject.prod.rida.module.state.change',
'msg': {
'id': 1,
'state': 'some state',
},
}
self.fn(config=self.config, session=self.session, msg=msg)