diff options
Diffstat (limited to 'keystone-moon/debian/tests')
-rw-r--r-- | keystone-moon/debian/tests/fix-migration.patch | 31 | ||||
-rwxr-xr-x | keystone-moon/debian/tests/test_overrides.conf | 41 |
2 files changed, 0 insertions, 72 deletions
diff --git a/keystone-moon/debian/tests/fix-migration.patch b/keystone-moon/debian/tests/fix-migration.patch deleted file mode 100644 index 79d67cdd..00000000 --- a/keystone-moon/debian/tests/fix-migration.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Fix migration for tests - Migration when creating the db in order to test it didn't work, as the config - could not be found. This patch fixes it for the test run. -Author: Thomas Goirand <zigo@debian.org> -Forwarded: not-needed -Last-Update: 2014-03-12 - ---- keystone-2014.1~b3.orig/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py -+++ keystone-2014.1~b3/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py -@@ -31,7 +31,7 @@ def upgrade(migrate_engine): - domain_table = sql.Table('domain', meta, autoload=True) - - domain = { -- 'id': CONF.identity.default_domain_id, -+ 'id': 'default', - 'name': 'Default', - 'enabled': True, - 'extra': json.dumps({ ---- keystone-2014.1~b3.orig/keystone/common/sql/migrate_repo/versions/017_membership_role.py -+++ keystone-2014.1~b3/keystone/common/sql/migrate_repo/versions/017_membership_role.py -@@ -46,8 +46,8 @@ def upgrade(migrate_engine): - - conn = migrate_engine.connect() - conn.execute(role_table.insert(), -- id=CONF.member_role_id, -- name=CONF.member_role_name, -+ id='9fe2ff9ee4384b1894a90878d3e92bab', -+ name='_member_', - extra=json.dumps({'description': - 'Default role for project membership', - 'enabled': 'True'})) diff --git a/keystone-moon/debian/tests/test_overrides.conf b/keystone-moon/debian/tests/test_overrides.conf deleted file mode 100755 index 031932d4..00000000 --- a/keystone-moon/debian/tests/test_overrides.conf +++ /dev/null @@ -1,41 +0,0 @@ -[DEFAULT] -crypt_strength = 1000 - -[identity] -driver = keystone.identity.backends.kvs.Identity - -[catalog] -driver = keystone.catalog.backends.templated.Catalog -template_file = default_catalog.templates - -[trust] -driver = keystone.trust.backends.kvs.Trust - -[token] -driver = keystone.token.backends.kvs.Token - -[cache] -backend = dogpile.cache.memory -enabled = True -debug_cache_backend = True -proxies = keystone.tests.test_cache.CacheIsolatingProxy - -[sql] -connection = sqlite:////%CUR_DIR%/debian/tests/testing.db -idle_timeout = 200 - -[signing] -certfile = examples/pki/certs/signing_cert.pem -keyfile = examples/pki/private/signing_key.pem -ca_certs = /examples/pki/certs/cacert.pem - -[kvs] -backends = keystone.tests.test_kvs.KVSBackendForcedKeyMangleFixture, keystone.tests.test_kvs.KVSBackendFixture - -[auth] -methods = external,password,token,oauth1,saml2 -oauth1 = keystone.auth.plugins.oauth1.OAuth -saml2 = keystone.auth.plugins.saml2.Saml2 - -[revoke] -driver=keystone.contrib.revoke.backends.kvs.Revoke |