Skip DNF tests if there are import problems
If there are import errors for DNF, multilib or other related package, we can assume the tests are running on EPEL. The DNF tests should be skipped in that case. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
parent
5dd2b3947d
commit
2b21e13aad
@ -18,8 +18,12 @@ sys.path.insert(0, os.path.join(HERE, '..'))
|
|||||||
os.environ['PATH'] = '%s:%s' % (BINDIR, os.environ['PATH'])
|
os.environ['PATH'] = '%s:%s' % (BINDIR, os.environ['PATH'])
|
||||||
|
|
||||||
from pungi.wrappers.pungi import PungiWrapper
|
from pungi.wrappers.pungi import PungiWrapper
|
||||||
from pungi.dnf_wrapper import DnfWrapper, Conf
|
try:
|
||||||
from pungi.gather_dnf import Gather, GatherOptions, PkgFlag
|
from pungi.dnf_wrapper import DnfWrapper, Conf
|
||||||
|
from pungi.gather_dnf import Gather, GatherOptions, PkgFlag
|
||||||
|
HAS_DNF = True
|
||||||
|
except ImportError:
|
||||||
|
HAS_DNF = False
|
||||||
|
|
||||||
|
|
||||||
def convert_pkg_map(data):
|
def convert_pkg_map(data):
|
||||||
@ -1621,6 +1625,7 @@ def convert_dnf_packages(pkgs, flags):
|
|||||||
return sorted(result)
|
return sorted(result)
|
||||||
|
|
||||||
|
|
||||||
|
@unittest.skipUnless(HAS_DNF, 'Dependencies are not available')
|
||||||
class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
|
class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(DNFDepsolvingTestCase, self).setUp()
|
super(DNFDepsolvingTestCase, self).setUp()
|
||||||
|
Loading…
Reference in New Issue
Block a user