diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-05-29 08:59:47 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-06-13 08:14:40 +0100 |
| commit | b2aa78b5588bf4bfb66951b868a3b641d2dd64e1 (patch) | |
| tree | afadef884abdf5c6b6899729ae9b9205abc8f626 /tests/_ldap_livetest.py | |
| parent | 84a7f3751088159035d89920fa8590aa206d65e5 (diff) | |
| download | keystone-b2aa78b5588bf4bfb66951b868a3b641d2dd64e1.tar.gz keystone-b2aa78b5588bf4bfb66951b868a3b641d2dd64e1.tar.xz keystone-b2aa78b5588bf4bfb66951b868a3b641d2dd64e1.zip | |
Use cfg's new global CONF object
Implements blueprint cfg-global-object
Change-Id: Ic53b41dafa8666ce21f33697f7e8697f1e5cb0fd
Diffstat (limited to 'tests/_ldap_livetest.py')
| -rw-r--r-- | tests/_ldap_livetest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py index 6a4420b8..7afd2ec0 100644 --- a/tests/_ldap_livetest.py +++ b/tests/_ldap_livetest.py @@ -60,9 +60,9 @@ def clear_live_database(): class LDAPIdentity(test.TestCase, test_backend.IdentityTests): def setUp(self): super(LDAPIdentity, self).setUp() - CONF(config_files=[test.etcdir('keystone.conf.sample'), - test.testsdir('test_overrides.conf'), - test.testsdir('backend_liveldap.conf')]) + self.config([test.etcdir('keystone.conf.sample'), + test.testsdir('test_overrides.conf'), + test.testsdir('backend_liveldap.conf')]) clear_live_database() self.identity_api = identity_ldap.Identity() self.load_fixtures(default_fixtures) |