Making more tests pass.

rackerlabs · May 1, 2015 · 65252bd · 65252bd
1 parent 4c19947
commit 65252bd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/mimic/model/nova_objects.py b/mimic/model/nova_objects.py
@@ -585,7 +585,7 @@ def request_list(self, http_get_request, include_details, absolutize_url,
                 return dumps(bad_request("limit param must be an integer",
                                          http_get_request))
 
-            to_be_listed = to_be_listed[:int(limit)]
+            to_be_listed = to_be_listed[:limit]
 
         result = {
             "servers": [
@@ -601,8 +601,7 @@ def request_list(self, http_get_request, include_details, absolutize_url,
         # server link blob is returned.
         if limit and len(to_be_listed) >= limit:
             query_params = {'limit': limit}
-            if marker is not None:
-                query_params['marker'] = marker
+            query_params['marker'] = to_be_listed[-1].server_id
             if name:
                 query_params['name'] = name
 

diff --git a/mimic/test/test_nova.py b/mimic/test/test_nova.py
@@ -479,9 +479,10 @@ def match_body_with_links(self, result, expected_servers, expected_path,
             ])
         })
         mismatch = expected_matcher.match(result)
-        self.assertEqual(None, mismatch, mismatch.describe())
-        link = result['server_links'][0]['href']
-        query_string = link.split('?', 1)[0]
+        self.assertEqual(None, mismatch,
+                         "Great" if mismatch is None else mismatch.describe())
+        link = result['servers_links'][0]['href']
+        query_string = link.split('?', 1)[-1]
         self.assertEqual(expected_query_params, parse_qs(query_string))
 
     def test_with_invalid_marker(self):
@@ -577,7 +578,7 @@ def test_with_marker_and_name(self):
                              [server['name'] for server in servers],
                              "Assumption about server list ordering is wrong")
             with_params = self.list_servers(
-                path, {'marker': servers[0]['id'], 'name': "server_1"})
+                path, {'marker': servers[0]['id'], 'name': "1"})
             self.assertEqual({'servers': servers[2:]}, with_params)
 
     def test_with_limit_lt_servers_only(self):
@@ -596,7 +597,7 @@ def test_with_limit_lt_servers_only(self):
                 expected_servers=[servers[0]],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 1, 'marker': servers[0]['id']
+                    'limit': ['1'], 'marker': [servers[0]['id']]
                 }
             )
 
@@ -616,7 +617,7 @@ def test_with_limit_eq_servers_only(self):
                 expected_servers=[servers[0]],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 1, 'marker': servers[0]['id']
+                    'limit': ['1'], 'marker': [servers[0]['id']]
                 }
             )
 
@@ -654,7 +655,7 @@ def test_with_limit_lt_servers_with_name(self):
                 expected_servers=[servers[1]],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 1, 'marker': servers[1]['id']
+                    'limit': ['1'], 'marker': [servers[1]['id']]
                 }
             )
 
@@ -678,7 +679,9 @@ def test_with_limit_eq_servers_with_name(self):
                 expected_servers=servers[1:],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 2, 'marker': servers[2]['id'], 'name': '1'
+                    'limit': ['2'],
+                    'marker': [servers[2]['id']],
+                    'name': ['1']
                 }
             )
 
@@ -716,7 +719,7 @@ def test_with_limit_lt_servers_with_marker(self):
                 expected_servers=servers[1:],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 1, 'marker': servers[1]['id']
+                    'limit': ['1'], 'marker': [servers[1]['id']]
                 }
             )
 
@@ -737,7 +740,7 @@ def test_with_limit_eq_servers_with_marker(self):
                 expected_servers=servers[1:],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 2, 'marker': servers[2]['id']
+                    'limit': ['2'], 'marker': [servers[2]['id']]
                 }
             )
 
@@ -781,7 +784,7 @@ def test_with_limit_lt_servers_with_marker_and_name(self):
                 expected_servers=[servers[3]],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 1, 'marker': servers[3]['id']
+                    'limit': ['1'], 'marker': [servers[3]['id']]
                 }
             )
 
@@ -811,7 +814,9 @@ def test_with_limit_eq_servers_with_marker_and_name(self):
                 expected_servers=[servers[3], servers[5]],
                 expected_path=path,
                 expected_query_params={
-                    'limit': 2, 'marker': servers[5]['id'], 'name': '1'
+                    'limit': ['2'],
+                    'marker': [servers[5]['id']],
+                    'name': ['1']
                 }
             )