almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

image-build: Reduce duplication

Browse Source 
All tests should print complete diffs on failure, so there is no need to
define this in each test separately.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-11-28 09:28:46 +01:00
parent 5148adf233
commit 2bd18b1b03
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_imagebuildphase.py
View File

@ -20,6 +20,10 @@ from tests.helpers import DummyCompose, PungiTestCase, boom
class TestImageBuildPhase(PungiTestCase): class TestImageBuildPhase(PungiTestCase):
def setUp(self):
super(TestImageBuildPhase, self).setUp()
self.maxDiff = None
@mock.patch('pungi.phases.image_build.ThreadPool') @mock.patch('pungi.phases.image_build.ThreadPool')
def test_image_build(self, ThreadPool): def test_image_build(self, ThreadPool):
compose = DummyCompose(self.topdir, { compose = DummyCompose(self.topdir, {
@ -48,7 +52,6 @@ class TestImageBuildPhase(PungiTestCase):
phase = ImageBuildPhase(compose) phase = ImageBuildPhase(compose)
phase.run() phase.run()
self.maxDiff = None
# assert at least one thread was started # assert at least one thread was started
self.assertTrue(phase.pool.add.called) self.assertTrue(phase.pool.add.called)
@ -102,7 +105,6 @@ class TestImageBuildPhase(PungiTestCase):
"scratch": False, "scratch": False,
"failable_arches": ['x86_64'], "failable_arches": ['x86_64'],
} }
self.maxDiff = None
self.assertItemsEqual(phase.pool.queue_put.mock_calls, self.assertItemsEqual(phase.pool.queue_put.mock_calls,
[mock.call((compose, client_args)), [mock.call((compose, client_args)),
mock.call((compose, server_args))]) mock.call((compose, server_args))])
@ -135,7 +137,6 @@ class TestImageBuildPhase(PungiTestCase):
phase = ImageBuildPhase(compose) phase = ImageBuildPhase(compose)
phase.run() phase.run()
self.maxDiff = None
# assert at least one thread was started # assert at least one thread was started
self.assertTrue(phase.pool.add.called) self.assertTrue(phase.pool.add.called)
@ -165,7 +166,6 @@ class TestImageBuildPhase(PungiTestCase):
"scratch": False, "scratch": False,
"failable_arches": [], "failable_arches": [],
} }
self.maxDiff = None
self.assertItemsEqual(phase.pool.queue_put.mock_calls, self.assertItemsEqual(phase.pool.queue_put.mock_calls,
[mock.call((compose, server_args))]) [mock.call((compose, server_args))])
@ -194,7 +194,6 @@ class TestImageBuildPhase(PungiTestCase):
phase = ImageBuildPhase(compose) phase = ImageBuildPhase(compose)
phase.run() phase.run()
self.maxDiff = None
# assert at least one thread was started # assert at least one thread was started
self.assertTrue(phase.pool.add.called) self.assertTrue(phase.pool.add.called)
@ -224,7 +223,6 @@ class TestImageBuildPhase(PungiTestCase):
"scratch": False, "scratch": False,
"failable_arches": [], "failable_arches": [],
} }
self.maxDiff = None
self.assertItemsEqual(phase.pool.queue_put.mock_calls, self.assertItemsEqual(phase.pool.queue_put.mock_calls,
[mock.call((compose, server_args))]) [mock.call((compose, server_args))])
@ -298,7 +296,6 @@ class TestImageBuildPhase(PungiTestCase):
self.assertTrue(phase.pool.queue_put.called_once) self.assertTrue(phase.pool.queue_put.called_once)
args, kwargs = phase.pool.queue_put.call_args args, kwargs = phase.pool.queue_put.call_args
self.assertEqual(args[0][0], compose) self.assertEqual(args[0][0], compose)
self.maxDiff = None
self.assertDictEqual(args[0][1], { self.assertDictEqual(args[0][1], {
"format": [('docker', 'tar.xz')], "format": [('docker', 'tar.xz')],
"image_conf": { "image_conf": {
@ -362,7 +359,6 @@ class TestImageBuildPhase(PungiTestCase):
self.assertTrue(phase.pool.queue_put.called_once) self.assertTrue(phase.pool.queue_put.called_once)
args, kwargs = phase.pool.queue_put.call_args args, kwargs = phase.pool.queue_put.call_args
self.assertEqual(args[0][0], compose) self.assertEqual(args[0][0], compose)
self.maxDiff = None
self.assertDictEqual(args[0][1], { self.assertDictEqual(args[0][1], {
"format": [('docker', 'tar.xz')], "format": [('docker', 'tar.xz')],
"image_conf": { "image_conf": {
@ -427,7 +423,6 @@ class TestImageBuildPhase(PungiTestCase):
self.assertTrue(phase.pool.queue_put.called_once) self.assertTrue(phase.pool.queue_put.called_once)
args, kwargs = phase.pool.queue_put.call_args args, kwargs = phase.pool.queue_put.call_args
self.assertEqual(args[0][0], compose) self.assertEqual(args[0][0], compose)
self.maxDiff = None
self.assertDictEqual(args[0][1], { self.assertDictEqual(args[0][1], {
"format": [('docker', 'tar.xz')], "format": [('docker', 'tar.xz')],
"image_conf": { "image_conf": {