1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-08 11:16:47 +00:00

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.
This commit is contained in:
catborise 2026-11-06 11:18:11 +03:00
parent 03811cc4ab
commit 42ab293dc5
27 changed files with 1 additions and 139 deletions

2
.gitignore vendored
View file

@ -8,7 +8,7 @@ venv2
.webvirtcloud
*.pyc
db.sqlite3*
test_db.sqlite3*
test_db*.sqlite3*
console/cert.pem*
tags
dhcpd.*

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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,

View file

@ -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

View file

@ -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

View file

@ -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,

View file

@ -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

View file

@ -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

View file

@ -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 = """<domain><name>vm</name><memory>131072</memory><currentMemory>131072</currentMemory>

View file

@ -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

View file

@ -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

View file

@ -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 = """<domain><devices>

View file

@ -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

View file

@ -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

View file

@ -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."""

View file

@ -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

View file

@ -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)