From b8f2f8d63608d76af41fd218dddb955bdc656354 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 1 Jun 2011 10:00:15 -0400
Subject: fix filtering tests

---
 nova/tests/api/openstack/test_images.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index d6b01400e..c859a31de 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -826,7 +826,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'name': 'testname'}
-        image_service.index(context, filters).AndReturn([])
+        image_service.index(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images?name=testname')
@@ -840,7 +841,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'status': 'ACTIVE'}
-        image_service.index(context, filters).AndReturn([])
+        image_service.index(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images?status=ACTIVE')
@@ -854,7 +856,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'property-test': '3'}
-        image_service.index(context, filters).AndReturn([])
+        image_service.index(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images?property-test=3')
@@ -868,7 +871,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'status': 'ACTIVE'}
-        image_service.index(context, filters).AndReturn([])
+        image_service.index(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images?status=ACTIVE&UNSUPPORTEDFILTER=testname')
@@ -882,7 +886,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {}
-        image_service.index(context, filters).AndReturn([])
+        image_service.index(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images')
@@ -896,7 +901,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'name': 'testname'}
-        image_service.detail(context, filters).AndReturn([])
+        image_service.detail(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images/detail?name=testname')
@@ -910,7 +916,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'status': 'ACTIVE'}
-        image_service.detail(context, filters).AndReturn([])
+        image_service.detail(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images/detail?status=ACTIVE')
@@ -924,7 +931,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'property-test': '3'}
-        image_service.detail(context, filters).AndReturn([])
+        image_service.detail(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images/detail?property-test=3')
@@ -938,7 +946,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {'status': 'ACTIVE'}
-        image_service.detail(context, filters).AndReturn([])
+        image_service.detail(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images/detail?status=ACTIVE&UNSUPPORTEDFILTER=testname')
@@ -952,7 +961,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         image_service = mocker.CreateMockAnything()
         context = object()
         filters = {}
-        image_service.detail(context, filters).AndReturn([])
+        image_service.detail(
+            context, filters=filters, marker=0, limit=0).AndReturn([])
         mocker.ReplayAll()
         request = webob.Request.blank(
             '/v1.1/images/detail')
-- 
cgit