| |
@@ -18,7 +18,7 @@
|
| |
|
| |
class DumbMock(object):
|
| |
def __init__(self, **kwargs):
|
| |
- for key, value in kwargs.iteritems():
|
| |
+ for key, value in kwargs.items():
|
| |
setattr(self, key, value)
|
| |
|
| |
|
| |
@@ -83,6 +83,7 @@
|
| |
'ksurl': 'git://example.com/ks.git',
|
| |
'distro': 'test-distro',
|
| |
'release': '20160222.0',
|
| |
+ 'disk_size': 4,
|
| |
}
|
| |
},
|
| |
self.tmpfile
|
| |
@@ -105,7 +106,8 @@
|
| |
'kickstart = test-kickstart',
|
| |
'ksurl = git://example.com/ks.git',
|
| |
'distro = test-distro',
|
| |
- 'release = 20160222.0'])
|
| |
+ 'release = 20160222.0',
|
| |
+ 'disk_size = 4'])
|
| |
|
| |
def test_get_image_paths(self):
|
| |
|
| |
@@ -391,7 +393,8 @@
|
| |
self.assertDictEqual(result, {'retcode': 0, 'output': output, 'task_id': None})
|
| |
self.assertEqual(
|
| |
run.call_args_list,
|
| |
- [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True)]
|
| |
+ [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True,
|
| |
+ universal_newlines=True)]
|
| |
)
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
@@ -404,7 +407,8 @@
|
| |
self.assertDictEqual(result, {'retcode': 0, 'output': output, 'task_id': 1234})
|
| |
self.assertEqual(
|
| |
run.call_args_list,
|
| |
- [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True)]
|
| |
+ [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True,
|
| |
+ universal_newlines=True)]
|
| |
)
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
@@ -417,7 +421,8 @@
|
| |
self.assertDictEqual(result, {'retcode': 1, 'output': output, 'task_id': None})
|
| |
self.assertEqual(
|
| |
run.call_args_list,
|
| |
- [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True)]
|
| |
+ [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True,
|
| |
+ universal_newlines=True)]
|
| |
)
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
@@ -430,7 +435,8 @@
|
| |
self.assertDictEqual(result, {'retcode': 1, 'output': output, 'task_id': 12345})
|
| |
self.assertEqual(
|
| |
run.call_args_list,
|
| |
- [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True)]
|
| |
+ [mock.call(cmd, can_fail=True, env=None, logfile=None, show_cmd=True,
|
| |
+ universal_newlines=True)]
|
| |
)
|
| |
|
| |
@mock.patch.dict('os.environ', {'FOO': 'BAR'}, clear=True)
|
| |
@@ -450,7 +456,7 @@
|
| |
self.assertEqual(
|
| |
run.call_args_list,
|
| |
[mock.call(cmd, can_fail=True, env={'KRB5CCNAME': 'DIR:/tmp/foo', 'FOO': 'BAR'},
|
| |
- logfile=None, show_cmd=True)]
|
| |
+ logfile=None, show_cmd=True, universal_newlines=True)]
|
| |
)
|
| |
|
| |
|
| |
@@ -464,7 +470,8 @@
|
| |
|
| |
self.assertDictEqual(result, {'retcode': 0, 'output': output, 'task_id': 1234})
|
| |
self.assertItemsEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile=None, env=None)])
|
| |
+ [mock.call('cmd', can_fail=True, logfile=None, env=None,
|
| |
+ universal_newlines=True)])
|
| |
|
| |
@mock.patch.dict('os.environ', {'FOO': 'BAR'}, clear=True)
|
| |
@mock.patch('pungi.util.temp_dir')
|
| |
@@ -480,7 +487,8 @@
|
| |
self.assertDictEqual(result, {'retcode': 0, 'output': output, 'task_id': 1234})
|
| |
self.assertItemsEqual(run.mock_calls,
|
| |
[mock.call('cmd', can_fail=True, logfile=None,
|
| |
- env={'KRB5CCNAME': 'DIR:/tmp/foo', 'FOO': 'BAR'})])
|
| |
+ env={'KRB5CCNAME': 'DIR:/tmp/foo', 'FOO': 'BAR'},
|
| |
+ universal_newlines=True)])
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
def test_with_log(self, run):
|
| |
@@ -491,7 +499,8 @@
|
| |
|
| |
self.assertDictEqual(result, {'retcode': 0, 'output': output, 'task_id': 1234})
|
| |
self.assertItemsEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile='logfile', env=None)])
|
| |
+ [mock.call('cmd', can_fail=True, logfile='logfile', env=None,
|
| |
+ universal_newlines=True)])
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
def test_fail_with_task_id(self, run):
|
| |
@@ -502,7 +511,8 @@
|
| |
|
| |
self.assertDictEqual(result, {'retcode': 1, 'output': output, 'task_id': 1234})
|
| |
self.assertItemsEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile=None, env=None)])
|
| |
+ [mock.call('cmd', can_fail=True, logfile=None, env=None,
|
| |
+ universal_newlines=True)])
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
def test_fail_without_task_id(self, run):
|
| |
@@ -513,7 +523,8 @@
|
| |
self.koji.run_blocking_cmd('cmd')
|
| |
|
| |
self.assertItemsEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile=None, env=None)])
|
| |
+ [mock.call('cmd', can_fail=True, logfile=None, env=None,
|
| |
+ universal_newlines=True)])
|
| |
self.assertIn('Could not find task ID', str(ctx.exception))
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
@@ -526,9 +537,10 @@
|
| |
|
| |
self.assertDictEqual(result, {'retcode': 0, 'output': retry, 'task_id': 1234})
|
| |
self.assertEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile=None, env=None),
|
| |
+ [mock.call('cmd', can_fail=True, logfile=None, env=None,
|
| |
+ universal_newlines=True),
|
| |
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
|
| |
- can_fail=True, logfile=None)])
|
| |
+ can_fail=True, logfile=None, universal_newlines=True)])
|
| |
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
def test_disconnect_and_retry_but_fail(self, run):
|
| |
@@ -540,9 +552,10 @@
|
| |
|
| |
self.assertDictEqual(result, {'retcode': 1, 'output': retry, 'task_id': 1234})
|
| |
self.assertEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile=None, env=None),
|
| |
+ [mock.call('cmd', can_fail=True, logfile=None, env=None,
|
| |
+ universal_newlines=True),
|
| |
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
|
| |
- can_fail=True, logfile=None)])
|
| |
+ can_fail=True, logfile=None, universal_newlines=True)])
|
| |
|
| |
@mock.patch('time.sleep')
|
| |
@mock.patch('pungi.wrappers.kojiwrapper.run')
|
| |
@@ -555,13 +568,14 @@
|
| |
|
| |
self.assertDictEqual(result, {'retcode': 0, 'output': retry, 'task_id': 1234})
|
| |
self.assertEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile=None, env=None),
|
| |
+ [mock.call('cmd', can_fail=True, logfile=None, env=None,
|
| |
+ universal_newlines=True),
|
| |
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
|
| |
- can_fail=True, logfile=None),
|
| |
+ can_fail=True, logfile=None, universal_newlines=True),
|
| |
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
|
| |
- can_fail=True, logfile=None),
|
| |
+ can_fail=True, logfile=None, universal_newlines=True),
|
| |
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
|
| |
- can_fail=True, logfile=None)])
|
| |
+ can_fail=True, logfile=None, universal_newlines=True)])
|
| |
self.assertEqual(sleep.mock_calls,
|
| |
[mock.call(i * 10) for i in range(1, 3)])
|
| |
|
| |
@@ -576,11 +590,12 @@
|
| |
|
| |
self.assertIn('Failed to wait', str(ctx.exception))
|
| |
self.assertEqual(run.mock_calls,
|
| |
- [mock.call('cmd', can_fail=True, logfile=None, env=None),
|
| |
+ [mock.call('cmd', can_fail=True, logfile=None, env=None,
|
| |
+ universal_newlines=True),
|
| |
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
|
| |
- can_fail=True, logfile=None),
|
| |
+ can_fail=True, logfile=None, universal_newlines=True),
|
| |
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
|
| |
- can_fail=True, logfile=None)])
|
| |
+ can_fail=True, logfile=None, universal_newlines=True)])
|
| |
self.assertEqual(sleep.mock_calls, [mock.call(i * 10) for i in range(1, 2)])
|
| |
|
| |
|
| |
This should make all tests pass on both Python 2 and Python 3.
Unittest2 is required on Py 2.6 and Py 3.
This also requires a py3 compatible version of kobo that is not released yet.