tests: Skip keystoneauth tests if not available

Change-Id: I80af28b49415c5bea6399683922b6649f04ed011
This commit is contained in:
Tim Burke 2023-07-07 14:32:05 -07:00
parent 236c2775c6
commit c52e404262
2 changed files with 17 additions and 5 deletions

View File

@ -16,10 +16,13 @@ import datetime
import json
import unittest
from unittest import mock
from keystoneauth1 import plugin
from keystoneauth1 import loading
from keystoneauth1 import exceptions
from swiftclient import authv1
try:
from keystoneauth1 import plugin
from keystoneauth1 import loading
from keystoneauth1 import exceptions
from swiftclient import authv1
except ImportError:
plugin = loading = exceptions = authv1 = None
class TestDataNoAccount:
@ -44,6 +47,10 @@ class TestDataWithAccount:
class TestPluginLoading(TestDataNoAccount, unittest.TestCase):
def setUp(self):
if authv1 is None:
raise unittest.SkipTest('keystoneauth1 is not available')
def test_can_load(self):
loader = loading.get_plugin_loader('v1password')
self.assertIsInstance(loader, authv1.PasswordLoader)
@ -120,6 +127,8 @@ class TestPluginLoadingWithAccount(TestDataWithAccount, TestPluginLoading):
class TestPlugin(TestDataNoAccount, unittest.TestCase):
def setUp(self):
if authv1 is None:
raise unittest.SkipTest('keystoneauth1 is not available')
self.mock_session = mock.MagicMock()
self.mock_response = self.mock_session.get.return_value
self.mock_response.status_code = 200

View File

@ -579,7 +579,10 @@ class TestGetAuth(MockHttpTest):
self.assertTrue(token)
def test_auth_v3applicationcredential(self):
try:
from keystoneauth1 import exceptions as ksauthexceptions
except ImportError:
raise unittest.SkipTest('keystoneauth1 is not available')
os_options = {
"auth_type": "v3applicationcredential",