Merge pull request #66 from galitf/dnf-utils

lago-project · May 21, 2019 · 2d060db · 2d060db
2 parents 073353b + 846d1e3
commit 2d060db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/automation/check-patch.packages b/automation/check-patch.packages
@@ -2,6 +2,7 @@ bats
 dnf
 dnf-command(builddep)
 git
+gcc
 grubby
 python2-devel
 python2-dulwich

diff --git a/lago-ovirt.spec.in b/lago-ovirt.spec.in
@@ -43,7 +43,11 @@ Requires: python-magic
 Requires: python-nose
 Requires: ovirt-engine-sdk-python >= 3.6.9.1-1
 Requires: repoman >= 2.0.12
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Requires: dnf-utils
+%else
 Requires: yum-utils
+%endif
 Requires: rpm-build
 Requires: xz
 %{?python_provide:%python_provide python2-%{name}}

diff --git a/tests/unit/ovirtlago/test_runtest.py b/tests/unit/ovirtlago/test_runtest.py
@@ -19,12 +19,15 @@ def dummy_test():
     return DummyTest(id=lambda: 123)
 
 
-@pytest.mark.parametrize('exc', [ExtractPathError, ExtractPathNoPathError])
+@pytest.mark.parametrize(
+    ('exc', 'remote_path'),
+    [(ExtractPathError, ''), (ExtractPathNoPathError, '')]
+)
 @patch('ovirtlago.testlib.LOGGER')
 def test_log_collection_should_ignore_extract_path_error(
-    mock_logger, mock_prefix, dummy_test, exc
+    mock_logger, mock_prefix, dummy_test, exc, remote_path
 ):
-    exc_instance = exc()
+    exc_instance = exc(remote_path)
     mock_prefix.collect_artifacts.side_effect = exc_instance
     log_collector = testlib.LogCollectorPlugin(mock_prefix)
     log_collector._addFault(dummy_test, None)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ bats @@
     dnf
     dnf-command(builddep)
     git
+    gcc
     grubby
     python2-devel
     python2-dulwich
@@ Expand Down @@