From 116164799058a9d47a24c75a08288b99226a2eb3 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Thu, 6 Jul 2023 15:26:46 +0000 Subject: automatic import of rpkg-util --- skip_nvre_test.patch | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'skip_nvre_test.patch') diff --git a/skip_nvre_test.patch b/skip_nvre_test.patch index 6639d29..f71f484 100644 --- a/skip_nvre_test.patch +++ b/skip_nvre_test.patch @@ -1,24 +1,24 @@ -diff '--color=auto' -ur rpkg-util-orig/tests/unit/test_rpm_package.py rpkg-util/tests/unit/test_rpm_package.py ---- rpkg-util-orig/tests/unit/test_rpm_package.py 2023-07-06 22:49:22.808996754 +0800 -+++ rpkg-util/tests/unit/test_rpm_package.py 2023-07-06 22:50:44.758990339 +0800 -@@ -163,16 +163,16 @@ - version='1', release='1', epoch=None) - final_tmp_spec.return_value = spec_path - result = rpm_package.nvre() -- self.assertEqual(result, Munch({'name': 'testpkg', 'version': '1', -- 'release': '1', 'epoch': '(none)'})) -+ #self.assertEqual(result, Munch({'name': 'testpkg', 'version': '1', -+ # 'release': '1', 'epoch': '(none)'})) - - spec_path = self.dump_spec( - SPEC_TEMPLATE_WITH_EPOCH, name='testpkg2', - version='1', release='1', epoch='2') - final_tmp_spec.return_value = spec_path - result = rpm_package.nvre() -- self.assertEqual(result, Munch({'name': 'testpkg2', 'version': '1', -- 'release': '1', 'epoch': '2'})) -+ #self.assertEqual(result, Munch({'name': 'testpkg2', 'version': '1', -+ # 'release': '1', 'epoch': '2'})) - - def test_preproc_source_params(self): - rpm_package = RpmPackage(self.cwd, default_macros=['git.bash']) \ No newline at end of file +diff '--color=auto' -ur rpkg-util-orig/tests/unit/test_rpm_package.py rpkg-util/tests/unit/test_rpm_package.py +--- rpkg-util-orig/tests/unit/test_rpm_package.py 2023-07-06 22:49:22.808996754 +0800 ++++ rpkg-util/tests/unit/test_rpm_package.py 2023-07-06 22:50:44.758990339 +0800 +@@ -163,16 +163,16 @@ + version='1', release='1', epoch=None) + final_tmp_spec.return_value = spec_path + result = rpm_package.nvre() +- self.assertEqual(result, Munch({'name': 'testpkg', 'version': '1', +- 'release': '1', 'epoch': '(none)'})) ++ #self.assertEqual(result, Munch({'name': 'testpkg', 'version': '1', ++ # 'release': '1', 'epoch': '(none)'})) + + spec_path = self.dump_spec( + SPEC_TEMPLATE_WITH_EPOCH, name='testpkg2', + version='1', release='1', epoch='2') + final_tmp_spec.return_value = spec_path + result = rpm_package.nvre() +- self.assertEqual(result, Munch({'name': 'testpkg2', 'version': '1', +- 'release': '1', 'epoch': '2'})) ++ #self.assertEqual(result, Munch({'name': 'testpkg2', 'version': '1', ++ # 'release': '1', 'epoch': '2'})) + + def test_preproc_source_params(self): + rpm_package = RpmPackage(self.cwd, default_macros=['git.bash']) -- cgit v1.2.3