Replace extras.safe_hasattr
... because it was already removed[1]. Also extras hasn't been listed
in test dependencies.
[1] 304c046b05
Change-Id: Ib5589798f8f58e8ac376bc74547da489786787e1
This commit is contained in:
@@ -21,7 +21,6 @@ import sys
|
|||||||
import tempfile
|
import tempfile
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
import extras
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
import testtools
|
import testtools
|
||||||
@@ -557,8 +556,8 @@ class TestConf(testtools.TestCase):
|
|||||||
def test_setup_conf(self):
|
def test_setup_conf(self):
|
||||||
collect.setup_conf()
|
collect.setup_conf()
|
||||||
self.assertEqual('/var/lib/os-collect-config', cfg.CONF.cachedir)
|
self.assertEqual('/var/lib/os-collect-config', cfg.CONF.cachedir)
|
||||||
self.assertTrue(extras.safe_hasattr(cfg.CONF, 'ec2'))
|
self.assertTrue(hasattr(cfg.CONF, 'ec2'))
|
||||||
self.assertTrue(extras.safe_hasattr(cfg.CONF, 'cfn'))
|
self.assertTrue(hasattr(cfg.CONF, 'cfn'))
|
||||||
|
|
||||||
|
|
||||||
class TestHup(testtools.TestCase):
|
class TestHup(testtools.TestCase):
|
||||||
|
|||||||
Reference in New Issue
Block a user