From bc2a1e8d3cd34ff1f802f604f603186a76704796 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Wed, 3 Apr 2019 14:40:52 -0400
Subject: [PATCH] Fix the unit tests

---
 Vagrantfile                    | 1 +
 docker/Dockerfile-tests        | 1 +
 docker/Dockerfile-tests-py3    | 1 +
 tests/test_utils/test_utils.py | 8 ++------
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3609b6f8..7ff8a3f8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -20,6 +20,7 @@ $script = <<SCRIPT
         openssl-devel \
         python \
         python-devel \
+        python2-dnf \
         python-docutils \
         python-flask \
         python-gobject-base \
diff --git a/docker/Dockerfile-tests b/docker/Dockerfile-tests
index 8f2cda2f..bb889222 100644
--- a/docker/Dockerfile-tests
+++ b/docker/Dockerfile-tests
@@ -20,6 +20,7 @@ RUN yum -y install \
     kobo-rpmlib \
     libmodulemd \
     python-backports-ssl_match_hostname \
+    python-dnf \
     python-dogpile-cache \
     python-enum34 \
     python-flask \
diff --git a/docker/Dockerfile-tests-py3 b/docker/Dockerfile-tests-py3
index f185ec2d..3cd4d496 100644
--- a/docker/Dockerfile-tests-py3
+++ b/docker/Dockerfile-tests-py3
@@ -13,6 +13,7 @@ RUN dnf -y install \
     python3-rpm \
     libmodulemd \
     python3-gobject \
+    python3-dnf \
     python3-dogpile-cache \
     python3-flask \
     python3-flask-migrate \
diff --git a/tests/test_utils/test_utils.py b/tests/test_utils/test_utils.py
index 7d8d8614..b3ddfdd3 100644
--- a/tests/test_utils/test_utils.py
+++ b/tests/test_utils/test_utils.py
@@ -1254,10 +1254,8 @@ class TestOfflineLocalBuilds:
         profiles = mmd.get_profiles()
         assert set(profiles.keys()) == set(["buildroot", "srpm-buildroot"])
 
-    @patch("module_build_service.utils.general.open", create=True)
+    @patch("module_build_service.utils.general.open", create=True, new_callable=mock.mock_open)
     def test_import_builds_from_local_dnf_repos(self, patched_open):
-        pytest.importorskip("dnf")
-
         with patch("dnf.Base") as dnf_base:
             repo = mock.MagicMock()
             repo.repofile = "/etc/yum.repos.d/foo.repo"
@@ -1265,9 +1263,7 @@ class TestOfflineLocalBuilds:
                 repo.get_metadata_content.return_value = f.read()
             base = dnf_base.return_value
             base.repos = {"reponame": repo}
-
-            patched_open.return_value = mock.mock_open(
-                read_data="FOO=bar\nPLATFORM_ID=platform:x\n").return_value
+            patched_open.return_value.readlines.return_value = ('FOO=bar', 'PLATFORM_ID=platform:x')
 
             module_build_service.utils.import_builds_from_local_dnf_repos()