cephadm: clean-up imports

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 8fb0a5019c8ba7bf031eed7020bce10afff988e1)

diff --git a/src/cephadm/tests/fixtures.py b/src/cephadm/tests/fixtures.py
index a3f46253976e921a28d1d3640a814996efb65e86..bd0ae193a148cdbca909e2b09bf25ed923eb04d7 100644 (file)
--- a/src/cephadm/tests/fixtures.py
+++ b/src/cephadm/tests/fixtures.py
@@ -1,12 +1,10 @@
-
 import mock
-from mock import patch
-import pytest
-
 import os
+import pytest
 import time
 
-with patch('builtins.open', create=True):
+
+with mock.patch('builtins.open', create=True):
     from importlib.machinery import SourceFileLoader
     cd = SourceFileLoader('cephadm', 'cephadm').load_module()
 

diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py
index ec804c2ff4236d1a888f2e699b0bc9d9eacd77bb..95c335de1d643fa73d9e112c7390bf0b9306f92f 100644 (file)
--- a/src/cephadm/tests/test_cephadm.py
+++ b/src/cephadm/tests/test_cephadm.py
@@ -1,26 +1,28 @@
 # type: ignore
-from typing import List, Optional
+
+import errno
 import mock
-from mock import patch, call
 import os
+import pytest
+import socket
 import sys
-import unittest
-import threading
 import time
-import errno
-import socket
+import threading
+import unittest
+
 from http.server import HTTPServer
 from urllib.request import Request, urlopen
 from urllib.error import HTTPError
 
-import pytest
-
+from typing import List, Optional
 from .fixtures import exporter
 
-with patch('builtins.open', create=True):
+
+with mock.patch('builtins.open', create=True):
     from importlib.machinery import SourceFileLoader
     cd = SourceFileLoader('cephadm', 'cephadm').load_module()
 
+
 class TestCephAdm(object):
 
     @staticmethod
@@ -107,7 +109,7 @@ class TestCephAdm(object):
             except:
                 assert False
             else:
-                assert _socket.call_args == call(address_family, socket.SOCK_STREAM)
+                assert _socket.call_args == mock.call(address_family, socket.SOCK_STREAM)
 
     @mock.patch('socket.socket')
     @mock.patch('cephadm.logger')
@@ -999,10 +1001,10 @@ class TestMonitoring(object):
             daemon_id=daemon_id
         )
         assert _open.call_args_list == [
-            call('{}/etc/prometheus/prometheus.yml'.format(prefix), 'w',
+            mock.call('{}/etc/prometheus/prometheus.yml'.format(prefix), 'w',
                  encoding='utf-8'),
-            call('{}/etc/prometheus/alerting/ceph_alerts.yml'.format(prefix), 'w',
+            mock.call('{}/etc/prometheus/alerting/ceph_alerts.yml'.format(prefix), 'w',
                  encoding='utf-8'),
         ]
-        assert call().__enter__().write('foo') in _open.mock_calls
-        assert call().__enter__().write('bar') in _open.mock_calls
+        assert mock.call().__enter__().write('foo') in _open.mock_calls
+        assert mock.call().__enter__().write('bar') in _open.mock_calls