From 8835aee20c0a1ef515eb529b1365dfea85fbe3db Mon Sep 17 00:00:00 2001
From: Fei Long Wang <flwang@cn.ibm.com>
Date: Thu, 6 Mar 2014 16:38:10 +0800
Subject: [PATCH] Enable shards test for sqlalchemy

Now we have already implemented the sqlalchemy for shards and
catalogue, so this patch will enable the shards test for
sqlalchemy.

Closes-Bug: #1288148

Change-Id: I1bc96419f2525d5211448d68c8c871dda14535a7
---
 marconi/tests/queues/transport/wsgi/__init__.py |  1 +
 .../queues/transport/wsgi/test_messages.py      |  4 ----
 .../tests/queues/transport/wsgi/test_shards.py  | 17 ++++++++++++++++-
 tests/unit/queues/transport/wsgi/test_v1_0.py   |  4 ++++
 tests/unit/queues/transport/wsgi/test_v1_1.py   |  4 ++++
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/marconi/tests/queues/transport/wsgi/__init__.py b/marconi/tests/queues/transport/wsgi/__init__.py
index 63dea972a..c55057b31 100644
--- a/marconi/tests/queues/transport/wsgi/__init__.py
+++ b/marconi/tests/queues/transport/wsgi/__init__.py
@@ -44,3 +44,4 @@ TestQueueFaultyDriver = lc.TestQueueLifecycleFaultyDriver
 TestQueueLifecycleMongoDB = lc.TestQueueLifecycleMongoDB
 TestQueueLifecycleSqlalchemy = lc.TestQueueLifecycleSqlalchemy
 TestShardsMongoDB = test_shards.TestShardsMongoDB
+TestShardsSqlalchemy = test_shards.TestShardsSqlalchemy
diff --git a/marconi/tests/queues/transport/wsgi/test_messages.py b/marconi/tests/queues/transport/wsgi/test_messages.py
index cc96119b8..8b61cd5e7 100644
--- a/marconi/tests/queues/transport/wsgi/test_messages.py
+++ b/marconi/tests/queues/transport/wsgi/test_messages.py
@@ -459,10 +459,6 @@ class TestMessagesSqlalchemy(MessagesBaseTest):
     config_file = 'wsgi_sqlalchemy.conf'
 
 
-# TODO(cpp-cabrera): restore sqlalchemy sharded test suite once shards and
-# catalogue get an sqlalchemy implementation.
-
-
 class TestMessagesMongoDB(MessagesBaseTest):
 
     config_file = 'wsgi_mongodb.conf'
diff --git a/marconi/tests/queues/transport/wsgi/test_shards.py b/marconi/tests/queues/transport/wsgi/test_shards.py
index bcb0473e1..dbe78ae7d 100644
--- a/marconi/tests/queues/transport/wsgi/test_shards.py
+++ b/marconi/tests/queues/transport/wsgi/test_shards.py
@@ -252,7 +252,14 @@ class ShardsBaseTest(base.TestBase):
             self.assertIn('shards', results)
             shard_list = results['shards']
             self.assertEqual(len(shard_list), min(limit, count))
-            for (i, s), expect in zip(enumerate(shard_list), expected):
+            for s in shard_list:
+                # NOTE(flwang): It can't assumed that both sqlalchemy and
+                # mongodb can return query result with the same order. Just
+                # like the order they're inserted. Actually, sqlalchemy can't
+                # guarantee that. So we're leveraging the relationship between
+                # shard weight and the index of shards fixture to get the
+                # right shard to verify.
+                expect = expected[s['weight']]
                 path, weight = expect[:2]
                 self._shard_expect(s, path, weight, self.doc['uri'])
                 if detailed:
@@ -291,3 +298,11 @@ class TestShardsMongoDB(ShardsBaseTest):
     @testing.requires_mongodb
     def setUp(self):
         super(TestShardsMongoDB, self).setUp()
+
+
+class TestShardsSqlalchemy(ShardsBaseTest):
+
+    config_file = 'wsgi_sqlalchemy.conf'
+
+    def setUp(self):
+        super(TestShardsSqlalchemy, self).setUp()
diff --git a/tests/unit/queues/transport/wsgi/test_v1_0.py b/tests/unit/queues/transport/wsgi/test_v1_0.py
index 8b823bab4..8c1080ebf 100644
--- a/tests/unit/queues/transport/wsgi/test_v1_0.py
+++ b/tests/unit/queues/transport/wsgi/test_v1_0.py
@@ -86,6 +86,10 @@ class TestShardsMongoDB(wsgi.TestShardsMongoDB):
     url_prefix = URL_PREFIX
 
 
+class TestShardsSqlalchemy(wsgi.TestShardsSqlalchemy):
+    url_prefix = URL_PREFIX
+
+
 #----------------------------------------------------------------------------
 # v1.0 only
 #----------------------------------------------------------------------------
diff --git a/tests/unit/queues/transport/wsgi/test_v1_1.py b/tests/unit/queues/transport/wsgi/test_v1_1.py
index 0c8245f61..7fa4ddb5b 100644
--- a/tests/unit/queues/transport/wsgi/test_v1_1.py
+++ b/tests/unit/queues/transport/wsgi/test_v1_1.py
@@ -88,6 +88,10 @@ class TestShardsMongoDB(wsgi.TestShardsMongoDB):
     url_prefix = URL_PREFIX
 
 
+class TestShardsSqlalchemy(wsgi.TestShardsSqlalchemy):
+    url_prefix = URL_PREFIX
+
+
 #----------------------------------------------------------------------------
 # v1.1 only
 #----------------------------------------------------------------------------