From c2c36dc3c27c59786dda7b0577a9cf9496c64d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 26 Mar 2019 14:08:21 +0100 Subject: [PATCH] tests: Stop overwriting modulesdir for DNF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tests are not passing in Fedora builds with this code, since it was deleted in DNF. I think it's not actually doing anything, so we should be able to drop it as well. Signed-off-by: Lubomír Sedlář --- tests/test_gather.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/test_gather.py b/tests/test_gather.py index 95b768e5..0f6814f1 100644 --- a/tests/test_gather.py +++ b/tests/test_gather.py @@ -22,7 +22,6 @@ 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 @@ -1819,10 +1818,6 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase): conf = Conf(base_arch) conf.persistdir = persistdir conf.cachedir = self.cachedir - if int(dnf_version.split('.')[0]) < 3: - conf.modulesdir = os.path.join(persistdir, 'modules.d') - else: - conf.modulesdir._set(os.path.join(persistdir, 'modules.d')) if exclude: conf.exclude = exclude dnf = DnfWrapper(conf)