Fix: Deprecation warnings when running pytest

aleph-im · Oct 17, 2023 · 0489076 · 0489076
1 parent 3ea89fe
commit 0489076
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/aleph/vm/orchestrator/metrics.py b/src/aleph/vm/orchestrator/metrics.py
@@ -14,7 +14,6 @@
     from sqlalchemy.ext.declarative import declarative_base
 
 
-
 from .conf import make_db_url, settings
 
 Session: sessionmaker

diff --git a/tests/supervisor/test_resolvectl_dns_servers.py b/tests/supervisor/test_resolvectl_dns_servers.py
@@ -1,6 +1,6 @@
 # Avoid failures linked to nftables when initializing the global VmPool object
 import os
-
+from unittest import mock
 from aleph.vm.orchestrator.conf import (
     resolvectl_dns_servers,
     resolvectl_dns_servers_ipv4,
@@ -9,8 +9,8 @@
 os.environ["ALEPH_VM_ALLOW_VM_NETWORKING"] = "False"
 
 
-def test_resolvectl(mocker):
-    with mocker.patch(
+def test_resolvectl():
+    with mock.patch(
         "aleph.vm.orchestrator.conf.check_output",
         return_value="Link 2 (eth0): 109.88.203.3 62.197.111.140\n",
     ):
@@ -23,8 +23,8 @@ def test_resolvectl(mocker):
         assert dns_servers_ipv4 == servers
 
 
-def test_resolvectl_ipv6(mocker):
-    with mocker.patch(
+def test_resolvectl_ipv6():
+    with mock.patch(
         "aleph.vm.orchestrator.conf.check_output",
         return_value="Link 2 (eth0): 109.88.203.3 62.197.111.140 2a02:2788:fff0:7::3\n        2a02:2788:fff0:5::140\n",
     ):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,6 @@
		from sqlalchemy.ext.declarative import declarative_base



		from .conf import make_db_url, settings

		Session: sessionmaker
Expand Down