Merge "Drop usage of extras.hasattr"

This commit is contained in:
Zuul 2024-05-08 18:57:18 +00:00 committed by Gerrit Code Review
commit 0cf24ffbf9
3 changed files with 2 additions and 5 deletions

View File

@ -22,7 +22,6 @@ import tempfile
from os_client_config import cloud_config
import extras
import fixtures
from oslotest import base
import yaml
@ -230,7 +229,7 @@ class TestCase(base.BaseTestCase):
def _assert_cloud_details(self, cc):
self.assertIsInstance(cc, cloud_config.CloudConfig)
self.assertTrue(extras.safe_hasattr(cc, 'auth'))
self.assertTrue(hasattr(cc, 'auth'))
self.assertIsInstance(cc.auth, dict)
self.assertIsNone(cc.cloud)
self.assertIn('username', cc.auth)

View File

@ -16,7 +16,6 @@ import argparse
import copy
import os
import extras
import fixtures
import testtools
import yaml
@ -677,7 +676,7 @@ class TestConfigArgparse(base.TestCase):
# Not using assert_cloud_details because of cache settings which
# are not present without the file
self.assertIsInstance(cc, cloud_config.CloudConfig)
self.assertTrue(extras.safe_hasattr(cc, 'auth'))
self.assertTrue(hasattr(cc, 'auth'))
self.assertIsInstance(cc.auth, dict)
self.assertIsNone(cc.cloud)
self.assertIn('username', cc.auth)

View File

@ -1,7 +1,6 @@
hacking>=6.1.0,<6.2.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
extras>=1.0.0 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD
jsonschema>=3.2.0 # MIT
python-glanceclient>=2.8.0 # Apache-2.0