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 7267fc4f9480c15a8286b98f8063d9093665b01f
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.
Also remove other changes which were added which are not actually
needed.
---
libcloud/test/common/test_digitalocean_v2.py | 8 ++------
libcloud/test/compute/test_digitalocean_v2.py | 4 ----
libcloud/test/dns/test_digitalocean.py | 4 ----
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/libcloud/test/common/test_digitalocean_v2.py
b/libcloud/test/common/test_digitalocean_v2.py
index 90fc365f3..0f39e9cee 100644
--- a/libcloud/test/common/test_digitalocean_v2.py
+++ b/libcloud/test/common/test_digitalocean_v2.py
@@ -21,21 +21,17 @@ from libcloud.utils.py3 import httplib
from libcloud.common.types import InvalidCredsError
from libcloud.test.secrets import DIGITALOCEAN_v2_PARAMS
from libcloud.test.file_fixtures import FileFixtures
-from libcloud.common.digitalocean import DigitalOceanBaseDriver
+from libcloud.common.digitalocean import DigitalOceanBaseDriver,
DigitalOcean_v2_BaseDriver
from libcloud.dns.drivers.digitalocean import DigitalOceanDNSDriver
class DigitalOceanTests(LibcloudTestCase):
def setUp(self):
DigitalOceanBaseDriver.connectionCls.conn_class =
DigitalOceanCommonMockHttp
+ DigitalOcean_v2_BaseDriver.connectionCls.conn_class =
DigitalOceanCommonMockHttp
DigitalOceanCommonMockHttp.type = None
self.driver = DigitalOceanBaseDriver(*DIGITALOCEAN_v2_PARAMS)
- def tearDown(self):
- LibcloudConnection.type = None
- DigitalOceanCommonMockHttp.type = None
- DigitalOceanBaseDriver.connectionCls.conn_class = LibcloudConnection
-
def test_authentication(self):
DigitalOceanCommonMockHttp.type = "UNAUTHORIZED"
self.assertRaises(InvalidCredsError, self.driver.ex_account_info)
diff --git a/libcloud/test/compute/test_digitalocean_v2.py
b/libcloud/test/compute/test_digitalocean_v2.py
index e5593284d..310f2e778 100644
--- a/libcloud/test/compute/test_digitalocean_v2.py
+++ b/libcloud/test/compute/test_digitalocean_v2.py
@@ -40,10 +40,6 @@ class DigitalOcean_v2_Tests(LibcloudTestCase):
DigitalOceanComputeMockHttp.type = None
self.driver = DigitalOceanNodeDriver(*DIGITALOCEAN_v2_PARAMS)
- def tearDown(self):
- LibcloudConnection.type = None
- DigitalOceanComputeMockHttp.type = None
-
def test_v1_Error(self):
self.assertRaises(
DigitalOcean_v1_Error,
diff --git a/libcloud/test/dns/test_digitalocean.py
b/libcloud/test/dns/test_digitalocean.py
index e65435d45..952c060ac 100644
--- a/libcloud/test/dns/test_digitalocean.py
+++ b/libcloud/test/dns/test_digitalocean.py
@@ -30,10 +30,6 @@ class DigitalOceanDNSTests(LibcloudTestCase):
DigitalOceanDNSMockHttp.type = None
self.driver = DigitalOceanDNSDriver(*DIGITALOCEAN_v2_PARAMS)
- def tearDown(self):
- LibcloudConnection.type = None
- DigitalOceanDNSMockHttp.type = None
-
def test_list_zones(self):
zones = self.driver.list_zones()
self.assertTrue(len(zones) >= 1)
