From bf055a485b610e0aed73917b54a535737a07f33e Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 5 Mar 2014 16:32:48 +0100 Subject: [PATCH] Replace `Sqlite` with `Sqlalchemy` in test names Change-Id: I94f6aaa1e608e34717bd1d3f2b5b0c9a606aa8bc --- marconi/tests/queues/transport/wsgi/__init__.py | 12 ++++++------ marconi/tests/queues/transport/wsgi/test_claims.py | 2 +- marconi/tests/queues/transport/wsgi/test_messages.py | 2 +- .../queues/transport/wsgi/test_queue_lifecycle.py | 2 +- tests/unit/queues/transport/wsgi/test_v1_0.py | 6 +++--- tests/unit/queues/transport/wsgi/test_v1_1.py | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/marconi/tests/queues/transport/wsgi/__init__.py b/marconi/tests/queues/transport/wsgi/__init__.py index 8b7394ac0..63dea972a 100644 --- a/marconi/tests/queues/transport/wsgi/__init__.py +++ b/marconi/tests/queues/transport/wsgi/__init__.py @@ -24,7 +24,7 @@ from marconi.tests.queues.transport.wsgi import test_default_limits from marconi.tests.queues.transport.wsgi import test_home from marconi.tests.queues.transport.wsgi import test_media_type from marconi.tests.queues.transport.wsgi import test_messages -from marconi.tests.queues.transport.wsgi import test_queue_lifecycle +from marconi.tests.queues.transport.wsgi import test_queue_lifecycle as lc from marconi.tests.queues.transport.wsgi import test_shards TestBase = base.TestBase @@ -32,15 +32,15 @@ TestBaseFaulty = base.TestBaseFaulty TestAuth = test_auth.TestAuth TestClaimsFaultyDriver = test_claims.TestClaimsFaultyDriver TestClaimsMongoDB = test_claims.TestClaimsMongoDB -TestClaimsSQLite = test_claims.TestClaimsSQLite +TestClaimsSqlalchemy = test_claims.TestClaimsSqlalchemy TestDefaultLimits = test_default_limits.TestDefaultLimits TestHomeDocument = test_home.TestHomeDocument TestMediaType = test_media_type.TestMediaType TestMessagesFaultyDriver = test_messages.TestMessagesFaultyDriver TestMessagesMongoDB = test_messages.TestMessagesMongoDB TestMessagesMongoDBSharded = test_messages.TestMessagesMongoDBSharded -TestMessagesSQLite = test_messages.TestMessagesSQLite -TestQueueFaultyDriver = test_queue_lifecycle.TestQueueLifecycleFaultyDriver -TestQueueLifecycleMongoDB = test_queue_lifecycle.TestQueueLifecycleMongoDB -TestQueueLifecycleSQLite = test_queue_lifecycle.TestQueueLifecycleSQLite +TestMessagesSqlalchemy = test_messages.TestMessagesSqlalchemy +TestQueueFaultyDriver = lc.TestQueueLifecycleFaultyDriver +TestQueueLifecycleMongoDB = lc.TestQueueLifecycleMongoDB +TestQueueLifecycleSqlalchemy = lc.TestQueueLifecycleSqlalchemy TestShardsMongoDB = test_shards.TestShardsMongoDB diff --git a/marconi/tests/queues/transport/wsgi/test_claims.py b/marconi/tests/queues/transport/wsgi/test_claims.py index 7e31728ca..7ae6f682f 100644 --- a/marconi/tests/queues/transport/wsgi/test_claims.py +++ b/marconi/tests/queues/transport/wsgi/test_claims.py @@ -243,7 +243,7 @@ class TestClaimsMongoDB(ClaimsBaseTest): super(TestClaimsMongoDB, self).tearDown() -class TestClaimsSQLite(ClaimsBaseTest): +class TestClaimsSqlalchemy(ClaimsBaseTest): config_file = 'wsgi_sqlalchemy.conf' diff --git a/marconi/tests/queues/transport/wsgi/test_messages.py b/marconi/tests/queues/transport/wsgi/test_messages.py index 5b0a41bf9..cc96119b8 100644 --- a/marconi/tests/queues/transport/wsgi/test_messages.py +++ b/marconi/tests/queues/transport/wsgi/test_messages.py @@ -454,7 +454,7 @@ class MessagesBaseTest(base.TestBase): return headers['location'].rsplit('=', 1)[-1].split(',') -class TestMessagesSQLite(MessagesBaseTest): +class TestMessagesSqlalchemy(MessagesBaseTest): config_file = 'wsgi_sqlalchemy.conf' diff --git a/marconi/tests/queues/transport/wsgi/test_queue_lifecycle.py b/marconi/tests/queues/transport/wsgi/test_queue_lifecycle.py index de77aa1fc..b0a4ac606 100644 --- a/marconi/tests/queues/transport/wsgi/test_queue_lifecycle.py +++ b/marconi/tests/queues/transport/wsgi/test_queue_lifecycle.py @@ -352,7 +352,7 @@ class TestQueueLifecycleMongoDB(QueueLifecycleBaseTest): super(TestQueueLifecycleMongoDB, self).tearDown() -class TestQueueLifecycleSQLite(QueueLifecycleBaseTest): +class TestQueueLifecycleSqlalchemy(QueueLifecycleBaseTest): config_file = 'wsgi_sqlalchemy.conf' diff --git a/tests/unit/queues/transport/wsgi/test_v1_0.py b/tests/unit/queues/transport/wsgi/test_v1_0.py index c9e255a62..8b823bab4 100644 --- a/tests/unit/queues/transport/wsgi/test_v1_0.py +++ b/tests/unit/queues/transport/wsgi/test_v1_0.py @@ -38,7 +38,7 @@ class TestClaimsMongoDB(wsgi.TestClaimsMongoDB): url_prefix = URL_PREFIX -class TestClaimsSQLite(wsgi.TestClaimsSQLite): +class TestClaimsSqlalchemy(wsgi.TestClaimsSqlalchemy): url_prefix = URL_PREFIX @@ -66,7 +66,7 @@ class TestMessagesMongoDBSharded(wsgi.TestMessagesMongoDBSharded): url_prefix = URL_PREFIX -class TestMessagesSQLite(wsgi.TestMessagesSQLite): +class TestMessagesSqlalchemy(wsgi.TestMessagesSqlalchemy): url_prefix = URL_PREFIX @@ -78,7 +78,7 @@ class TestQueueLifecycleMongoDB(wsgi.TestQueueLifecycleMongoDB): url_prefix = URL_PREFIX -class TestQueueLifecycleSQLite(wsgi.TestQueueLifecycleSQLite): +class TestQueueLifecycleSqlalchemy(wsgi.TestQueueLifecycleSqlalchemy): url_prefix = URL_PREFIX diff --git a/tests/unit/queues/transport/wsgi/test_v1_1.py b/tests/unit/queues/transport/wsgi/test_v1_1.py index e6cf6a2fa..0c8245f61 100644 --- a/tests/unit/queues/transport/wsgi/test_v1_1.py +++ b/tests/unit/queues/transport/wsgi/test_v1_1.py @@ -38,7 +38,7 @@ class TestClaimsMongoDB(wsgi.TestClaimsMongoDB): url_prefix = URL_PREFIX -class TestClaimsSQLite(wsgi.TestClaimsSQLite): +class TestClaimsSqlalchemy(wsgi.TestClaimsSqlalchemy): url_prefix = URL_PREFIX @@ -66,7 +66,7 @@ class TestMessagesMongoDBSharded(wsgi.TestMessagesMongoDBSharded): url_prefix = URL_PREFIX -class TestMessagesSQLite(wsgi.TestMessagesSQLite): +class TestMessagesSqlalchemy(wsgi.TestMessagesSqlalchemy): url_prefix = URL_PREFIX @@ -80,7 +80,7 @@ class TestQueueLifecycleMongoDB(wsgi.TestQueueLifecycleMongoDB): url_prefix = URL_PREFIX -class TestQueueLifecycleSQLite(wsgi.TestQueueLifecycleSQLite): +class TestQueueLifecycleSqlalchemy(wsgi.TestQueueLifecycleSqlalchemy): url_prefix = URL_PREFIX