This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master
in repository copr/copr.
commit 6916cc158b1b7adec6c8e634b3051f4597ee5f2c
Author: Jakub Kadlcik <frostyx(a)email.cz>
AuthorDate: Tue Feb 4 13:45:24 2020 +0100
rpmbuild: fix failing tests
Relates: #1245
---
rpmbuild/tests/test_base.py | 3 ++-
rpmbuild/tests/test_pypi.py | 7 +++++--
rpmbuild/tests/test_rubygems.py | 10 +++++++---
rpmbuild/tests/test_scm.py | 31 ++++++++++++++++++++++---------
rpmbuild/tests/test_spec.py | 10 +++++++---
5 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/rpmbuild/tests/test_base.py b/rpmbuild/tests/test_base.py
index 92ad9a7..019c6a9 100644
--- a/rpmbuild/tests/test_base.py
+++ b/rpmbuild/tests/test_base.py
@@ -16,7 +16,8 @@ class TestProvider(TestCase):
self.resultdir = "/path/to/resultdir"
@mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
- def test_create_rpmmacros(self, mock_open):
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_create_rpmmacros(self, mock_mkdir, mock_open):
provider = Provider(self.source_json, self.resultdir, self.config)
rpmmacros = mock.MagicMock()
mock_open.return_value = rpmmacros
diff --git a/rpmbuild/tests/test_pypi.py b/rpmbuild/tests/test_pypi.py
index 3d435bc..690b964 100644
--- a/rpmbuild/tests/test_pypi.py
+++ b/rpmbuild/tests/test_pypi.py
@@ -19,7 +19,9 @@ class TestPyPIProvider(TestCase):
"python_versions": [2, 3]}
self.resultdir = "/path/to/resultdir"
- def test_init(self):
+ @mock.patch("{0}.open".format(builtins))
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_init(self, mock_mkdir, mock_open):
provider = PyPIProvider(self.source_json, self.resultdir, self.config)
self.assertEqual(provider.pypi_package_version, "1.52")
self.assertEqual(provider.pypi_package_name, "motionpaint")
@@ -28,7 +30,8 @@ class TestPyPIProvider(TestCase):
@mock.patch("copr_rpmbuild.providers.pypi.run_cmd")
@mock.patch("{0}.open".format(builtins))
- def test_produce_srpm(self, mock_open, run_cmd):
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_produce_srpm(self, mock_mkdir, mock_open, run_cmd):
provider = PyPIProvider(self.source_json, "/some/tmp/directory",
self.config)
provider.produce_srpm()
assert_cmd = ["pyp2rpm", "motionpaint", "-t",
"epel7", "--srpm", "-d", "/some/tmp/directory",
diff --git a/rpmbuild/tests/test_rubygems.py b/rpmbuild/tests/test_rubygems.py
index 2a408f0..2216779 100644
--- a/rpmbuild/tests/test_rubygems.py
+++ b/rpmbuild/tests/test_rubygems.py
@@ -19,13 +19,16 @@ class TestRubyGemsProvider(TestCase):
self.source_json = {"gem_name": "A_123"}
self.resultdir = "/path/to/resultdir"
- def test_init(self):
+ @mock.patch("{0}.open".format(builtins))
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_init(self, mock_mkdir, mock_open):
provider = RubyGemsProvider(self.source_json, self.resultdir, self.config)
self.assertEqual(provider.gem_name, "A_123")
@mock.patch("copr_rpmbuild.providers.rubygems.run_cmd")
@mock.patch("{0}.open".format(builtins))
- def test_produce_srpm(self, mock_open, run_cmd):
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_produce_srpm(self, mock_mkdir, mock_open, run_cmd):
provider = RubyGemsProvider(self.source_json, self.resultdir, self.config)
provider.produce_srpm()
assert_cmd = ["gem2rpm", "A_123", "--srpm",
"-C", "/path/to/resultdir", "--fetch"]
@@ -33,7 +36,8 @@ class TestRubyGemsProvider(TestCase):
@mock.patch("copr_rpmbuild.providers.rubygems.run_cmd")
@mock.patch("{0}.open".format(builtins))
- def test_empty_license(self, mock_open, run_cmd):
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_empty_license(self, mock_mkdir, mock_open, run_cmd):
stderr = ("error: line 8: Empty tag: License:"
"Command failed: rpmbuild -bs --nodeps --define '_sourcedir
/tmp/gem2rpm-foo-20170905-3367-c2flks'"
"--define '_srcrpmdir .'
/tmp/gem2rpm-foo-20170905-3367-c2flks/rubygem-foo.spec")
diff --git a/rpmbuild/tests/test_scm.py b/rpmbuild/tests/test_scm.py
index dac9155..aee3d85 100644
--- a/rpmbuild/tests/test_scm.py
+++ b/rpmbuild/tests/test_scm.py
@@ -9,9 +9,11 @@ from . import TestCase
try:
from unittest import mock
+ builtins = 'builtins'
except ImportError:
# Python 2 version depends on mock
import mock
+ builtins = '__builtin__'
RPKG_CONF_JINJA = """
[rpkg]
@@ -32,7 +34,9 @@ class TestScmProvider(TestCase):
}
self.resultdir = "/path/to/resultdir"
- def test_init(self):
+ @mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_init(self, mock_mkdir, mock_open):
source_json = self.source_json.copy()
provider = ScmProvider(source_json, self.resultdir, self.config)
@@ -57,7 +61,8 @@ class TestScmProvider(TestCase):
self.assertEqual(provider.spec_path, os.path.join(provider.workdir,
"somerepo", "SPECS", "pkg.spec"))
def test_generate_rpkg_config(self):
- rpkg_tmpdir = tempfile.mkdtemp(prefix="copr-rpmbuild-test-")
+ tmpdir = tempfile.mkdtemp(prefix="copr-rpmbuild-test-")
+ rpkg_tmpdir = tempfile.mkdtemp(prefix="copr-rpmbuild-test-",
dir=tmpdir)
rpkg_config = open(os.path.join(rpkg_tmpdir, "rpkg.conf.j2"),
"w")
rpkg_config.write(RPKG_CONF_JINJA)
rpkg_config.close()
@@ -66,7 +71,7 @@ class TestScmProvider(TestCase):
source_json["clone_url"] =
"http://copr-dist-git.fedorainfracloud.org/git/clime/project/pkg.git"
with mock.patch("copr_rpmbuild.providers.scm.CONF_DIRS",
new=[rpkg_tmpdir]):
- provider = ScmProvider(source_json, self.resultdir, self.config)
+ provider = ScmProvider(source_json, tmpdir, self.config)
rpkg_config_path = provider.generate_rpkg_config()
config = configparser.RawConfigParser()
@@ -78,32 +83,40 @@ class TestScmProvider(TestCase):
source_json["clone_url"] =
"http://unknownurl/git/clime/project/pkg.git"
with mock.patch("copr_rpmbuild.providers.scm.CONF_DIRS",
new=[rpkg_tmpdir]):
- provider = ScmProvider(source_json, self.resultdir, self.config)
+ provider = ScmProvider(source_json, tmpdir, self.config)
rpkg_config_path = provider.generate_rpkg_config()
self.assertEqual(rpkg_config_path, os.path.join(os.environ['HOME'],
'.config', 'rpkg.conf'))
- shutil.rmtree(rpkg_tmpdir)
+ shutil.rmtree(tmpdir)
- def test_get_rpkg_command(self):
+ @mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_get_rpkg_command(self, mock_mkdir, mock_open):
provider = ScmProvider(self.source_json, self.resultdir, self.config)
provider.generate_rpkg_config =
mock.MagicMock(return_value="/etc/rpkg.conf")
assert_cmd = ["rpkg", "srpm", "--outdir",
self.resultdir, "--spec", provider.spec_path]
self.assertEqual(provider.get_rpkg_command(), assert_cmd)
- def test_get_tito_command(self):
+ @mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_get_tito_command(self, mock_mkdir, mock_open):
provider = ScmProvider(self.source_json, self.resultdir, self.config)
assert_cmd = ["tito", "build", "--srpm",
"--output", self.resultdir]
self.assertEqual(provider.get_tito_command(), assert_cmd)
@mock.patch("copr_rpmbuild.helpers.run_cmd")
- def test_get_tito_test_command(self, run_cmd_mock):
+ @mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_get_tito_test_command(self, mock_mkdir, mock_open, run_cmd_mock):
provider = ScmProvider(self.source_json, self.resultdir, self.config)
assert_cmd = ["tito", "build", "--test",
"--srpm", "--output", self.resultdir]
self.assertEqual(provider.get_tito_test_command(), assert_cmd)
@mock.patch("copr_rpmbuild.providers.scm.get_mock_uniqueext")
- def test_get_make_srpm_command(self, get_mock_uniqueext_mock):
+ @mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_get_make_srpm_command(self, mock_mkdir, mock_open,
get_mock_uniqueext_mock):
get_mock_uniqueext_mock.return_value = '2'
provider = ScmProvider(self.source_json, self.resultdir, self.config)
bind_mount_cmd_part = '--plugin-option=bind_mount:dirs=(("{0}",
"/mnt{1}"), ("{2}", "/mnt{3}"))'\
diff --git a/rpmbuild/tests/test_spec.py b/rpmbuild/tests/test_spec.py
index d437663..ea91b64 100644
--- a/rpmbuild/tests/test_spec.py
+++ b/rpmbuild/tests/test_spec.py
@@ -33,14 +33,17 @@ class TestUrlProvider(TestCase):
self.source_json = {"url":
u"http://foo.ex/somepackage.spec"}
self.resultdir = "/path/to/resultdir"
- def test_init(self):
+ @mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_init(self, mock_mkdir, mock_open):
provider = UrlProvider(self.source_json, self.resultdir, self.config)
self.assertEqual(provider.url, "http://foo.ex/somepackage.spec")
@mock.patch('requests.get')
@mock.patch("copr_rpmbuild.providers.spec.run_cmd")
@mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
- def test_produce_srpm(self, mock_open, run_cmd, mock_get):
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_produce_srpm(self, mock_mkdir, mock_open, run_cmd, mock_get):
provider = UrlProvider(self.source_json, self.resultdir, self.config)
provider.produce_srpm()
run_cmd.assert_called_with(["rpkg", "srpm",
"--outdir", self.resultdir,
@@ -49,7 +52,8 @@ class TestUrlProvider(TestCase):
@mock.patch('requests.get')
@mock.patch('{0}.open'.format(builtins), new_callable=mock.mock_open())
- def test_save_spec(self, mock_open, mock_get):
+ @mock.patch('copr_rpmbuild.providers.base.os.mkdir')
+ def test_save_spec(self, mock_mkdir, mock_open, mock_get):
provider = UrlProvider(self.source_json, self.resultdir, self.config)
provider.save_spec()
mock_open.assert_called_with("{0}/somepackage.spec".format(provider.workdir),
"w")
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.