This is an automated email from the ASF dual-hosted git repository.
tomaz pushed a commit to branch dependabot/pip/pytest-8.0.2
in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit b78b55ba25b1e7650bc95665c893be13f86f0257
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Tue Apr 16 19:06:09 2024 +0200
Additional changes to the DigitalOcean tests to avoid cross test
pollution and related failures when running tests in parallel.
---
libcloud/test/compute/test_digitalocean_v2.py | 5 ++++-
libcloud/test/dns/test_digitalocean.py | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/libcloud/test/compute/test_digitalocean_v2.py
b/libcloud/test/compute/test_digitalocean_v2.py
index e5593284d..c58d5a698 100644
--- a/libcloud/test/compute/test_digitalocean_v2.py
+++ b/libcloud/test/compute/test_digitalocean_v2.py
@@ -24,7 +24,7 @@ from libcloud.compute.base import NodeImage
from libcloud.test.secrets import DIGITALOCEAN_v1_PARAMS,
DIGITALOCEAN_v2_PARAMS
from libcloud.utils.iso8601 import UTC
from libcloud.test.file_fixtures import ComputeFileFixtures
-from libcloud.common.digitalocean import DigitalOcean_v1_Error
+from libcloud.common.digitalocean import DigitalOcean_v1_Error,
DigitalOceanBaseDriver
from libcloud.compute.drivers.digitalocean import DigitalOceanNodeDriver
try:
@@ -36,6 +36,7 @@ except ImportError:
# class DigitalOceanTests(unittest.TestCase, TestCaseMixin):
class DigitalOcean_v2_Tests(LibcloudTestCase):
def setUp(self):
+ DigitalOceanBaseDriver.connectionCls.conn_class =
DigitalOceanComputeMockHttp
DigitalOceanNodeDriver.connectionCls.conn_class =
DigitalOceanComputeMockHttp
DigitalOceanComputeMockHttp.type = None
self.driver = DigitalOceanNodeDriver(*DIGITALOCEAN_v2_PARAMS)
@@ -43,6 +44,8 @@ class DigitalOcean_v2_Tests(LibcloudTestCase):
def tearDown(self):
LibcloudConnection.type = None
DigitalOceanComputeMockHttp.type = None
+ DigitalOceanBaseDriver.connectionCls.conn_class = LibcloudConnection
+ DigitalOceanNodeDriver.connectionCls.conn_class = LibcloudConnection
def test_v1_Error(self):
self.assertRaises(
diff --git a/libcloud/test/dns/test_digitalocean.py
b/libcloud/test/dns/test_digitalocean.py
index e65435d45..ed92e59bb 100644
--- a/libcloud/test/dns/test_digitalocean.py
+++ b/libcloud/test/dns/test_digitalocean.py
@@ -21,11 +21,13 @@ from libcloud.dns.types import RecordType
from libcloud.utils.py3 import httplib
from libcloud.test.secrets import DIGITALOCEAN_v2_PARAMS
from libcloud.test.file_fixtures import DNSFileFixtures
+from libcloud.common.digitalocean import DigitalOceanBaseDriver
from libcloud.dns.drivers.digitalocean import DigitalOceanDNSDriver
class DigitalOceanDNSTests(LibcloudTestCase):
def setUp(self):
+ DigitalOceanBaseDriver.connectionCls.conn_class =
DigitalOceanDNSMockHttp
DigitalOceanDNSDriver.connectionCls.conn_class =
DigitalOceanDNSMockHttp
DigitalOceanDNSMockHttp.type = None
self.driver = DigitalOceanDNSDriver(*DIGITALOCEAN_v2_PARAMS)
@@ -33,6 +35,8 @@ class DigitalOceanDNSTests(LibcloudTestCase):
def tearDown(self):
LibcloudConnection.type = None
DigitalOceanDNSMockHttp.type = None
+ DigitalOceanBaseDriver.connectionCls.conn_class = LibcloudConnection
+ DigitalOceanDNSDriver.connectionCls.conn_class = LibcloudConnection
def test_list_zones(self):
zones = self.driver.list_zones()
