From c106d653a50c56e41b972189b0817296881b84b2 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: May 16 2022 16:07:39 +0000
Subject: Import the mock module in test in a consistent way


Signed-off-by: Nils Philippsen <nils@redhat.com>

---

diff --git a/tests/rpmautospec/subcommands/test_convert.py b/tests/rpmautospec/subcommands/test_convert.py
index f30573b..9ab200d 100644
--- a/tests/rpmautospec/subcommands/test_convert.py
+++ b/tests/rpmautospec/subcommands/test_convert.py
@@ -4,7 +4,7 @@ Test the rpmautospec.subcommands.converter module
 
 import logging
 from types import SimpleNamespace
-import unittest.mock
+from unittest import mock
 
 import pygit2
 import pytest
@@ -51,7 +51,7 @@ def test_init_dirty_tree(specfile, repo):
         convert.PkgConverter(specfile)
 
 
-@unittest.mock.patch("rpmautospec.subcommands.convert.PkgConverter")
+@mock.patch("rpmautospec.subcommands.convert.PkgConverter")
 def test_main_invalid_args(specfile):
     args = SimpleNamespace(
         spec_or_path=specfile, message="", no_commit=False, no_changelog=False, no_release=False
@@ -70,7 +70,7 @@ def test_main_invalid_args(specfile):
         convert.main(args)
 
 
-@unittest.mock.patch("rpmautospec.subcommands.convert.PkgConverter")
+@mock.patch("rpmautospec.subcommands.convert.PkgConverter")
 def test_main_valid_args(pkg_converter_mock, specfile):
     pkg_converter = unittest.mock.Mock(spec=convert.PkgConverter)()
     pkg_converter_mock.return_value = pkg_converter
diff --git a/tests/rpmautospec/subcommands/test_release.py b/tests/rpmautospec/subcommands/test_release.py
index 42727f1..5614783 100644
--- a/tests/rpmautospec/subcommands/test_release.py
+++ b/tests/rpmautospec/subcommands/test_release.py
@@ -3,7 +3,7 @@ import os.path
 import tarfile
 import tempfile
 from pathlib import Path
-from unittest.mock import Mock
+from unittest import mock
 
 import pytest
 
@@ -39,7 +39,7 @@ class TestRelease:
                 assert release.calculate_release(unpacked_repo_dir) == expected_release
             else:
                 with caplog.at_level(logging.INFO):
-                    args = Mock()
+                    args = mock.Mock()
                     args.spec_or_path = unpacked_repo_dir
                     release.main(args)
                 assert f"calculate_release release: {expected_release}" in caplog.text