From 42ab293dc5869e34544f44adc4b5c9b5c3869d21 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 6 Nov 2026 11:18:11 +0300 Subject: [PATCH] test: remove code no test run executes - 25 vrtManager test modules configured settings themselves when Django had none (MAC_OUI, and in test_network_ip a fake django module): under manage.py test settings are always configured, so it never ran. - webvirtcloud/tests/test_common_tags.py tested no tag: it fetched an unknown URL, as test_error_pages and test_logging already do. - .gitignore covers the parallel runs' test_db_N.sqlite3 files too. --- .gitignore | 2 +- vrtManager/tests/test_agent_access.py | 5 ----- vrtManager/tests/test_change_network.py | 5 ----- vrtManager/tests/test_clone_nvram.py | 5 ----- vrtManager/tests/test_cloud_init_seed.py | 5 ----- vrtManager/tests/test_connection.py | 5 ----- vrtManager/tests/test_connection_threads.py | 5 ----- vrtManager/tests/test_console_setters.py | 5 ----- vrtManager/tests/test_device_edits.py | 5 ----- vrtManager/tests/test_disk_copy_migration.py | 4 ---- vrtManager/tests/test_disk_move.py | 4 ---- vrtManager/tests/test_external_snapshots.py | 5 ----- vrtManager/tests/test_host_reads.py | 5 ----- vrtManager/tests/test_instance_getters.py | 5 ----- vrtManager/tests/test_interface_addresses.py | 5 ----- vrtManager/tests/test_iso_media.py | 5 ----- vrtManager/tests/test_migration.py | 4 ---- vrtManager/tests/test_network_ip.py | 12 ------------ vrtManager/tests/test_persistent_edits.py | 5 ----- vrtManager/tests/test_read_cache.py | 5 ----- vrtManager/tests/test_resize_disk.py | 5 ----- vrtManager/tests/test_usage.py | 5 ----- vrtManager/tests/test_util.py | 5 ----- vrtManager/tests/test_volume_in_use.py | 4 ---- vrtManager/tests/test_xml_safety.py | 6 ------ vrtManager/tests/test_xpath_values.py | 5 ----- webvirtcloud/tests/test_common_tags.py | 9 --------- 27 files changed, 1 insertion(+), 139 deletions(-) delete mode 100644 webvirtcloud/tests/test_common_tags.py diff --git a/.gitignore b/.gitignore index 8c5f941b..7a278dce 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ venv2 .webvirtcloud *.pyc db.sqlite3* -test_db.sqlite3* +test_db*.sqlite3* console/cert.pem* tags dhcpd.* diff --git a/vrtManager/tests/test_agent_access.py b/vrtManager/tests/test_agent_access.py index 5c37cf11..ac152530 100644 --- a/vrtManager/tests/test_agent_access.py +++ b/vrtManager/tests/test_agent_access.py @@ -9,11 +9,6 @@ import json import unittest from unittest.mock import MagicMock, patch -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import libvirtError from vrtManager import instance as module from vrtManager.instance import wvmInstance diff --git a/vrtManager/tests/test_change_network.py b/vrtManager/tests/test_change_network.py index 10621558..b201e17d 100644 --- a/vrtManager/tests/test_change_network.py +++ b/vrtManager/tests/test_change_network.py @@ -1,11 +1,6 @@ import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import libvirtError from vrtManager.instance import wvmInstance diff --git a/vrtManager/tests/test_clone_nvram.py b/vrtManager/tests/test_clone_nvram.py index 12f650c6..e0ffbb7b 100644 --- a/vrtManager/tests/test_clone_nvram.py +++ b/vrtManager/tests/test_clone_nvram.py @@ -5,11 +5,6 @@ import contextlib import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from lxml import etree from vrtManager import util diff --git a/vrtManager/tests/test_cloud_init_seed.py b/vrtManager/tests/test_cloud_init_seed.py index 13b8dfbe..2d3544d8 100644 --- a/vrtManager/tests/test_cloud_init_seed.py +++ b/vrtManager/tests/test_cloud_init_seed.py @@ -6,11 +6,6 @@ import json import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - import pycdlib from libvirt import VIR_ERR_NO_STORAGE_VOL, libvirtError from vrtManager.connection import wvmConnect diff --git a/vrtManager/tests/test_connection.py b/vrtManager/tests/test_connection.py index ebbb6cb2..c62bcf72 100644 --- a/vrtManager/tests/test_connection.py +++ b/vrtManager/tests/test_connection.py @@ -9,12 +9,8 @@ import time import unittest from unittest.mock import MagicMock, patch -from django.conf import settings from django.core.signals import request_finished, request_started -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - import libvirt from vrtManager import connection from vrtManager.connection import CONN_SSH, CONN_TCP, SSH_COMMAND, wvmConnectionManager @@ -44,7 +40,6 @@ class ConnectionManagerTestCase(unittest.TestCase): slow.join() - def alive_connection(): conn = MagicMock() conn.isAlive.return_value = 1 diff --git a/vrtManager/tests/test_connection_threads.py b/vrtManager/tests/test_connection_threads.py index 037f2c5f..77d51999 100644 --- a/vrtManager/tests/test_connection_threads.py +++ b/vrtManager/tests/test_connection_threads.py @@ -7,11 +7,6 @@ import time import unittest from unittest.mock import MagicMock, patch -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - import libvirt from vrtManager.connection import CONN_TCP, wvmConnectionManager diff --git a/vrtManager/tests/test_console_setters.py b/vrtManager/tests/test_console_setters.py index 52588f25..9a4cbcd6 100644 --- a/vrtManager/tests/test_console_setters.py +++ b/vrtManager/tests/test_console_setters.py @@ -1,11 +1,6 @@ import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from lxml import etree from vrtManager.instance import PERSISTENT_XML, wvmInstance diff --git a/vrtManager/tests/test_device_edits.py b/vrtManager/tests/test_device_edits.py index 225ae1cd..26887f0c 100644 --- a/vrtManager/tests/test_device_edits.py +++ b/vrtManager/tests/test_device_edits.py @@ -8,11 +8,6 @@ the vCPUs enabled at boot.""" import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from lxml import etree from vrtManager import util diff --git a/vrtManager/tests/test_disk_copy_migration.py b/vrtManager/tests/test_disk_copy_migration.py index 7abed515..16d82eb6 100644 --- a/vrtManager/tests/test_disk_copy_migration.py +++ b/vrtManager/tests/test_disk_copy_migration.py @@ -11,10 +11,6 @@ import unittest from unittest import mock import libvirt -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") from vrtManager import util from vrtManager.connection import wvmConnect diff --git a/vrtManager/tests/test_disk_move.py b/vrtManager/tests/test_disk_move.py index b88e6a50..75844605 100644 --- a/vrtManager/tests/test_disk_move.py +++ b/vrtManager/tests/test_disk_move.py @@ -8,10 +8,6 @@ import unittest from unittest import mock import libvirt -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") from vrtManager import util from vrtManager.instance import wvmInstance diff --git a/vrtManager/tests/test_external_snapshots.py b/vrtManager/tests/test_external_snapshots.py index ad106921..4543886a 100644 --- a/vrtManager/tests/test_external_snapshots.py +++ b/vrtManager/tests/test_external_snapshots.py @@ -7,11 +7,6 @@ import unittest from datetime import datetime from unittest.mock import MagicMock, patch -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - import libvirt from libvirt import libvirtError from vrtManager import instance as instance_module diff --git a/vrtManager/tests/test_host_reads.py b/vrtManager/tests/test_host_reads.py index 33965376..0bcd5c38 100644 --- a/vrtManager/tests/test_host_reads.py +++ b/vrtManager/tests/test_host_reads.py @@ -8,11 +8,6 @@ can change interfaces at all.""" import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import ( VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET, VIR_DOMAIN_PAUSED, diff --git a/vrtManager/tests/test_instance_getters.py b/vrtManager/tests/test_instance_getters.py index 7488dc5a..3e625f52 100644 --- a/vrtManager/tests/test_instance_getters.py +++ b/vrtManager/tests/test_instance_getters.py @@ -4,11 +4,6 @@ NIC, CD-ROM or boot device does not carry over to the next.""" import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import libvirtError from vrtManager.instance import wvmInstance diff --git a/vrtManager/tests/test_interface_addresses.py b/vrtManager/tests/test_interface_addresses.py index 48db89c3..cda5b4f9 100644 --- a/vrtManager/tests/test_interface_addresses.py +++ b/vrtManager/tests/test_interface_addresses.py @@ -7,11 +7,6 @@ import json import unittest from unittest.mock import MagicMock, patch -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP, libvirtError from vrtManager import instance as module from vrtManager.instance import wvmInstance diff --git a/vrtManager/tests/test_iso_media.py b/vrtManager/tests/test_iso_media.py index ba52d87c..1bd8bed7 100644 --- a/vrtManager/tests/test_iso_media.py +++ b/vrtManager/tests/test_iso_media.py @@ -1,11 +1,6 @@ import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import ( VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE, VIR_DOMAIN_AFFECT_CONFIG, diff --git a/vrtManager/tests/test_migration.py b/vrtManager/tests/test_migration.py index 0656533d..768af75b 100644 --- a/vrtManager/tests/test_migration.py +++ b/vrtManager/tests/test_migration.py @@ -6,10 +6,6 @@ import unittest from unittest import mock import libvirt -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") from vrtManager import util from vrtManager.instance import wvmInstances diff --git a/vrtManager/tests/test_network_ip.py b/vrtManager/tests/test_network_ip.py index 411c4a4f..503bd62c 100644 --- a/vrtManager/tests/test_network_ip.py +++ b/vrtManager/tests/test_network_ip.py @@ -1,16 +1,4 @@ -import sys import unittest -from unittest.mock import MagicMock - -try: - from django.conf import settings - if not settings.configured: - settings.configure(MAC_OUI="52:54:10") -except ImportError: - django_mock = MagicMock() - django_mock.conf.settings.MAC_OUI = "52:54:10" - sys.modules["django"] = django_mock - sys.modules["django.conf"] = django_mock.conf from lxml import etree from vrtManager.network import ip_networks, network_size diff --git a/vrtManager/tests/test_persistent_edits.py b/vrtManager/tests/test_persistent_edits.py index 7aba1e59..04866001 100644 --- a/vrtManager/tests/test_persistent_edits.py +++ b/vrtManager/tests/test_persistent_edits.py @@ -1,11 +1,6 @@ import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from vrtManager.instance import PERSISTENT_XML, wvmInstance DOMAIN = """vm131072131072 diff --git a/vrtManager/tests/test_read_cache.py b/vrtManager/tests/test_read_cache.py index 2d24d16e..37303d23 100644 --- a/vrtManager/tests/test_read_cache.py +++ b/vrtManager/tests/test_read_cache.py @@ -6,11 +6,6 @@ info and capabilities are read once per object.""" import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import libvirtError from vrtManager.instance import wvmInstance diff --git a/vrtManager/tests/test_resize_disk.py b/vrtManager/tests/test_resize_disk.py index 9ee5b381..1f7dfcb9 100644 --- a/vrtManager/tests/test_resize_disk.py +++ b/vrtManager/tests/test_resize_disk.py @@ -1,11 +1,6 @@ import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from libvirt import VIR_DOMAIN_BLOCK_RESIZE_BYTES, VIR_STORAGE_VOL_BLOCK, VIR_STORAGE_VOL_FILE from vrtManager.instance import wvmInstance diff --git a/vrtManager/tests/test_usage.py b/vrtManager/tests/test_usage.py index 7516ed60..09ecbc53 100644 --- a/vrtManager/tests/test_usage.py +++ b/vrtManager/tests/test_usage.py @@ -7,11 +7,6 @@ import unittest from types import SimpleNamespace from unittest.mock import patch -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from vrtManager.instance import USAGE_MAX_WINDOW, wvmInstance XML = """ diff --git a/vrtManager/tests/test_util.py b/vrtManager/tests/test_util.py index 67077761..42d77e25 100644 --- a/vrtManager/tests/test_util.py +++ b/vrtManager/tests/test_util.py @@ -1,9 +1,5 @@ import unittest -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") from vrtManager.util import ( get_xml_path, @@ -82,7 +78,6 @@ class TestVrtManagerUtil(unittest.TestCase): self.assertEqual(vol_driver_type("linux-lvm", "disk"), "raw") # a partition - class OperationErrorTestCase(unittest.TestCase): def test_keeps_its_own_message_after_a_libvirt_failure(self): import libvirt diff --git a/vrtManager/tests/test_volume_in_use.py b/vrtManager/tests/test_volume_in_use.py index 5c2fb738..1e8c461f 100644 --- a/vrtManager/tests/test_volume_in_use.py +++ b/vrtManager/tests/test_volume_in_use.py @@ -6,12 +6,8 @@ import unittest from unittest.mock import MagicMock import libvirt -from django.conf import settings from libvirt import libvirtError -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from vrtManager import util from vrtManager.storage import wvmStorage diff --git a/vrtManager/tests/test_xml_safety.py b/vrtManager/tests/test_xml_safety.py index 2a78932c..e967bd5f 100644 --- a/vrtManager/tests/test_xml_safety.py +++ b/vrtManager/tests/test_xml_safety.py @@ -1,11 +1,6 @@ import unittest from unittest.mock import MagicMock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from vrtManager import util from vrtManager.instance import wvmInstance from vrtManager.network import wvmNetworks, wvmNetwork @@ -121,7 +116,6 @@ class TestXmlSafety(unittest.TestCase): self.assertIn("type='pflash'", inst._snapshotCreateXML.call_args[0][0]) - class TestCloneRollback(unittest.TestCase): """A failed clone removes only the volumes it created.""" diff --git a/vrtManager/tests/test_xpath_values.py b/vrtManager/tests/test_xpath_values.py index 884c7b33..a5f44c21 100644 --- a/vrtManager/tests/test_xpath_values.py +++ b/vrtManager/tests/test_xpath_values.py @@ -3,11 +3,6 @@ import unittest from unittest.mock import Mock -from django.conf import settings - -if not settings.configured: - settings.configure(MAC_OUI="52:54:10") - from vrtManager.connection import wvmConnect from vrtManager.network import wvmNetwork diff --git a/webvirtcloud/tests/test_common_tags.py b/webvirtcloud/tests/test_common_tags.py deleted file mode 100644 index 029d4635..00000000 --- a/webvirtcloud/tests/test_common_tags.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.contrib.auth import get_user_model -from django.test import TestCase - - -class NotFoundPageTestCase(TestCase): - def test_unknown_url_renders_404_for_logged_in_user(self): - user = get_user_model().objects.create_user("tags_user", "t@example.com", "pw") - self.client.force_login(user) - self.assertEqual(self.client.get("/no-such-page/").status_code, 404)