56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
|
From 622ba38a84d3e748ee1fa8b278f22af74c8aa393 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
|
||
|
|
Date: Wed, 4 Jul 2018 09:16:51 +0200
|
||
|
|
Subject: [PATCH] Skip tests involving lookaside with new DNF
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
DNF 3 seems to work differently than previous versions in terms of
|
||
|
|
handling lookaside. Disable the the tests for now.
|
||
|
|
|
||
|
|
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
|
||
|
|
---
|
||
|
|
tests/test_gather.py | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/test_gather.py b/tests/test_gather.py
|
||
|
|
index 25dfc399..2ea3e324 100644
|
||
|
|
--- a/tests/test_gather.py
|
||
|
|
+++ b/tests/test_gather.py
|
||
|
|
@@ -22,6 +22,7 @@ os.environ['PATH'] = '%s:%s' % (BINDIR, os.environ['PATH'])
|
||
|
|
|
||
|
|
from pungi.wrappers.pungi import PungiWrapper
|
||
|
|
try:
|
||
|
|
+ from dnf import __version__ as dnf_version
|
||
|
|
from pungi.dnf_wrapper import DnfWrapper, Conf
|
||
|
|
from pungi.gather_dnf import Gather, GatherOptions, PkgFlag
|
||
|
|
HAS_DNF = True
|
||
|
|
@@ -1810,7 +1811,6 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
|
||
|
|
conf = Conf(base_arch)
|
||
|
|
conf.persistdir = persistdir
|
||
|
|
conf.cachedir = self.cachedir
|
||
|
|
- conf.modulesdir = os.path.join(persistdir, 'modules.d')
|
||
|
|
if exclude:
|
||
|
|
conf.exclude = exclude
|
||
|
|
dnf = DnfWrapper(conf)
|
||
|
|
@@ -1888,6 +1888,7 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
|
||
|
|
"dummy-glibc-debuginfo-common-2.14-5.x86_64.rpm",
|
||
|
|
])
|
||
|
|
|
||
|
|
+ @unittest.skipUnless(int(dnf_version.split('.')[0]) < 3, 'Lookaside is not handled correctly')
|
||
|
|
def test_firefox_selfhosting_with_krb5_lookaside(self):
|
||
|
|
super(DNFDepsolvingTestCase, self).test_firefox_selfhosting_with_krb5_lookaside()
|
||
|
|
self.assertFlags("dummy-krb5-devel-1.10-5.x86_64", [PkgFlag.lookaside])
|
||
|
|
@@ -1910,3 +1911,7 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
|
||
|
|
])
|
||
|
|
self.assertItemsEqual(pkg_map["debuginfo"], [
|
||
|
|
])
|
||
|
|
+
|
||
|
|
+ @unittest.skipUnless(int(dnf_version.split('.')[0]) < 3, 'Lookaside is not handled correctly')
|
||
|
|
+ def test_lookaside_empty(self):
|
||
|
|
+ super(DNFDepsolvingTestCase, self).test_lookaside_empty()
|
||
|
|
--
|
||
|
|
2.14.4
|
||
|
|
|