| |
@@ -80,15 +80,15 @@
|
| |
self.child_config = os.path.join(self.configdir, 'child.cfg')
|
| |
|
| |
self.mock_rpm_call = [
|
| |
- 'unbuffer', 'mock', '--rebuild', 'srpm', '--configdir',
|
| |
- self.configdir, '--resultdir', self.resultdir,
|
| |
- '--uniqueext', '0', '-r', 'child']
|
| |
+ 'unbuffer', 'mock', '--rebuild', 'srpm',
|
| |
+ '--resultdir', self.resultdir, '--uniqueext', '0',
|
| |
+ '-r', self.child_config,
|
| |
+ ]
|
| |
|
| |
self.mock_srpm_call = [
|
| |
'unbuffer', 'mock', '--buildsrpm', '--spec', 'spec', '--sources',
|
| |
- self.sourcedir, '--configdir', self.configdir,
|
| |
- '--resultdir', self.resultdir, '--uniqueext', '0', '-r',
|
| |
- 'child']
|
| |
+ self.sourcedir, '--resultdir', self.resultdir, '--uniqueext', '0',
|
| |
+ '-r', self.child_config]
|
| |
|
| |
self.config = configparser.RawConfigParser()
|
| |
self.config.add_section('main')
|
| |
@@ -124,12 +124,13 @@
|
| |
assert config_opts["root"] == "10-fedora-24-x86_64"
|
| |
assert config_opts["chroot_additional_packages"] == "pkg1 pkg2 pkg3"
|
| |
assert config_opts["rpmbuild_networking"]
|
| |
- assert not config_opts["use_bootstrap_container"]
|
| |
+ assert not config_opts["use_bootstrap"]
|
| |
assert config_opts["macros"]["%copr_username"] == "@copr"
|
| |
assert config_opts["macros"]["%copr_projectname"] == "copr-dev"
|
| |
assert config_opts["yum.conf"] == []
|
| |
|
| |
- def test_mock_config(self, f_mock_calls):
|
| |
+ @mock.patch("copr_rpmbuild.builders.mock.subprocess.call")
|
| |
+ def test_mock_config(self, call, f_mock_calls):
|
| |
""" test that no module_enable statements are in config """
|
| |
MockBuilder(self.task, self.sourcedir, self.resultdir,
|
| |
self.config).run()
|
| |
@@ -152,13 +153,15 @@
|
| |
|
| |
config_opts['macros']['%copr_username'] = '@copr'
|
| |
config_opts['macros']['%copr_projectname'] = 'copr-dev'
|
| |
- config_opts['use_bootstrap_container'] = False
|
| |
+ config_opts['use_bootstrap'] = False
|
| |
|
| |
|
| |
|
| |
""" # TODO: make the output nicer
|
| |
|
| |
- def test_mock_options(self, f_mock_calls):
|
| |
+ @mock.patch("copr_rpmbuild.builders.mock.MockBuilder.prepare_configs")
|
| |
+ @mock.patch("copr_rpmbuild.builders.mock.MockBuilder.archive_configs")
|
| |
+ def test_mock_options(self, archive_configs, prep_configs, f_mock_calls):
|
| |
""" test that mock options are correctly constructed """
|
| |
MockBuilder(self.task, self.sourcedir, self.resultdir,
|
| |
self.config).run()
|
| |
@@ -170,20 +173,20 @@
|
| |
call = f_mock_calls[1]
|
| |
assert call[0][0] == self.mock_rpm_call
|
| |
|
| |
+ @mock.patch("copr_rpmbuild.builders.mock.MockBuilder.prepare_configs")
|
| |
@mock.patch("copr_rpmbuild.builders.mock.get_mock_uniqueext")
|
| |
@mock.patch("copr_rpmbuild.builders.mock.GentlyTimeoutedPopen")
|
| |
- def test_produce_rpm(self, popen_mock, get_mock_uniqueext_mock):
|
| |
+ def test_produce_rpm(self, popen_mock, get_mock_uniqueext_mock, prep_configs):
|
| |
builder = MockBuilder(self.task, self.sourcedir, self.resultdir, self.config)
|
| |
get_mock_uniqueext_mock.return_value = '2'
|
| |
process = mock.MagicMock(returncode=0)
|
| |
popen_mock.return_value = process
|
| |
- builder.produce_rpm("/path/to/pkg.src.rpm", "/path/to/configs", "/path/to/results")
|
| |
+ builder.produce_rpm("/path/to/pkg.src.rpm", "/path/to/results")
|
| |
assert_cmd = ['unbuffer', 'mock',
|
| |
'--rebuild', '/path/to/pkg.src.rpm',
|
| |
- '--configdir', '/path/to/configs',
|
| |
'--resultdir', '/path/to/results',
|
| |
'--uniqueext', '2',
|
| |
- '-r', 'child']
|
| |
+ '-r', builder.mock_config_file]
|
| |
popen_mock.assert_called_with(assert_cmd, stdin=subprocess.PIPE,
|
| |
timeout=21600)
|
| |
|
| |
@@ -194,12 +197,6 @@
|
| |
success = os.path.join(self.resultdir, "success")
|
| |
mock_open.assert_called_with(success, "w")
|
| |
|
| |
- def test_custom1_chroot_settings(self):
|
| |
- b1 = MockBuilder(self.task, self.sourcedir, self.resultdir, self.config)
|
| |
- b2 = MockBuilder(dict(self.task, **{"chroot": "custom-1-x86_64"}), self.sourcedir, self.resultdir, self.config)
|
| |
- assert b1.pkg_manager_conf == "yum"
|
| |
- assert b2.pkg_manager_conf == "dnf"
|
| |
-
|
| |
@pytest.mark.parametrize('modules', [
|
| |
['postgresql:9.6'],
|
| |
['moduleA:S1', 'moduleA:S2'],
|
| |
@@ -211,8 +208,10 @@
|
| |
self.task['modules'] = {
|
| |
'toggle': [{'enable': x} for x in modules],
|
| |
}
|
| |
- MockBuilder(self.task, self.sourcedir, self.resultdir,
|
| |
- self.config).run()
|
| |
+
|
| |
+ with mock.patch("copr_rpmbuild.builders.mock.subprocess.call"):
|
| |
+ MockBuilder(self.task, self.sourcedir, self.resultdir,
|
| |
+ self.config).run()
|
| |
|
| |
assert len(f_mock_calls) == 2 # srpm + rpm
|
| |
|
| |
@@ -224,7 +223,7 @@
|
| |
assert call[0][0] == self.mock_rpm_call
|
| |
|
| |
part_of_expected_output = (
|
| |
- "config_opts['use_bootstrap_container'] = False\n"
|
| |
+ "config_opts['use_bootstrap'] = False\n"
|
| |
"\n"
|
| |
"\n"
|
| |
"\n"
|
| |
@@ -247,6 +246,7 @@
|
| |
def test_module_mock_assertions(self, f_mock_calls, modules):
|
| |
'test that assertions work'
|
| |
self.task['modules'] = modules
|
| |
- with pytest.raises(AssertionError):
|
| |
- MockBuilder(self.task, self.sourcedir, self.resultdir,
|
| |
- self.config).run()
|
| |
+ with mock.patch("copr_rpmbuild.builders.mock.subprocess.call"):
|
| |
+ with pytest.raises(AssertionError):
|
| |
+ MockBuilder(self.task, self.sourcedir, self.resultdir,
|
| |
+ self.config).run()
|
| |