Skip to content

Commit c91d1ca

Browse files
author
Dean Troyer
committed
Beef up object-store tests
* Add object top-to-bottom tests * Move some fakes around * Clean up existing object tests Change-Id: If8406da611c11bbd2b1bf5153e45b720b0eea442
1 parent f600c0e commit c91d1ca

5 files changed

Lines changed: 228 additions & 58 deletions

File tree

‎openstackclient/tests/object/v1/fakes.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
# under the License.
1414
#
1515

16-
from openstackclient.tests import fakes
16+
from keystoneclient import session
17+
from openstackclient.api import object_store_v1 as object_store
1718
from openstackclient.tests import utils
1819

1920

@@ -78,7 +79,8 @@ class TestObjectv1(utils.TestCommand):
7879
def setUp(self):
7980
super(TestObjectv1, self).setUp()
8081

81-
self.app.client_manager.object_store = fakes.FakeClient(
82-
endpoint=fakes.AUTH_URL,
83-
token=fakes.AUTH_TOKEN,
82+
self.app.client_manager.session = session.Session()
83+
self.app.client_manager.object_store = object_store.APIv1(
84+
session=self.app.client_manager.session,
85+
endpoint=ENDPOINT,
8486
)

‎openstackclient/tests/object/v1/test_container.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ def test_object_list_containers_no_options(self, c_mock):
7474
)
7575

7676
collist = ('Name',)
77-
self.assertEqual(columns, collist)
77+
self.assertEqual(collist, columns)
7878
datalist = (
7979
(object_fakes.container_name, ),
8080
(object_fakes.container_name_3, ),
8181
(object_fakes.container_name_2, ),
8282
)
83-
self.assertEqual(tuple(data), datalist)
83+
self.assertEqual(datalist, tuple(data))
8484

8585
def test_object_list_containers_prefix(self, c_mock):
8686
c_mock.return_value = [
@@ -108,12 +108,12 @@ def test_object_list_containers_prefix(self, c_mock):
108108
)
109109

110110
collist = ('Name',)
111-
self.assertEqual(columns, collist)
111+
self.assertEqual(collist, columns)
112112
datalist = (
113113
(object_fakes.container_name, ),
114114
(object_fakes.container_name_3, ),
115115
)
116-
self.assertEqual(tuple(data), datalist)
116+
self.assertEqual(datalist, tuple(data))
117117

118118
def test_object_list_containers_marker(self, c_mock):
119119
c_mock.return_value = [
@@ -144,12 +144,12 @@ def test_object_list_containers_marker(self, c_mock):
144144
)
145145

146146
collist = ('Name',)
147-
self.assertEqual(columns, collist)
147+
self.assertEqual(collist, columns)
148148
datalist = (
149149
(object_fakes.container_name, ),
150150
(object_fakes.container_name_3, ),
151151
)
152-
self.assertEqual(tuple(data), datalist)
152+
self.assertEqual(datalist, tuple(data))
153153

154154
def test_object_list_containers_limit(self, c_mock):
155155
c_mock.return_value = [
@@ -177,12 +177,12 @@ def test_object_list_containers_limit(self, c_mock):
177177
)
178178

179179
collist = ('Name',)
180-
self.assertEqual(columns, collist)
180+
self.assertEqual(collist, columns)
181181
datalist = (
182182
(object_fakes.container_name, ),
183183
(object_fakes.container_name_3, ),
184184
)
185-
self.assertEqual(tuple(data), datalist)
185+
self.assertEqual(datalist, tuple(data))
186186

187187
def test_object_list_containers_long(self, c_mock):
188188
c_mock.return_value = [
@@ -209,7 +209,7 @@ def test_object_list_containers_long(self, c_mock):
209209
)
210210

211211
collist = ('Name', 'Bytes', 'Count')
212-
self.assertEqual(columns, collist)
212+
self.assertEqual(collist, columns)
213213
datalist = (
214214
(
215215
object_fakes.container_name,
@@ -222,7 +222,7 @@ def test_object_list_containers_long(self, c_mock):
222222
object_fakes.container_count * 3,
223223
),
224224
)
225-
self.assertEqual(tuple(data), datalist)
225+
self.assertEqual(datalist, tuple(data))
226226

227227
def test_object_list_containers_all(self, c_mock):
228228
c_mock.return_value = [
@@ -251,13 +251,13 @@ def test_object_list_containers_all(self, c_mock):
251251
)
252252

253253
collist = ('Name',)
254-
self.assertEqual(columns, collist)
254+
self.assertEqual(collist, columns)
255255
datalist = (
256256
(object_fakes.container_name, ),
257257
(object_fakes.container_name_2, ),
258258
(object_fakes.container_name_3, ),
259259
)
260-
self.assertEqual(tuple(data), datalist)
260+
self.assertEqual(datalist, tuple(data))
261261

262262

263263
@mock.patch(
@@ -295,10 +295,10 @@ def test_container_show(self, c_mock):
295295
)
296296

297297
collist = ('bytes', 'count', 'name')
298-
self.assertEqual(columns, collist)
298+
self.assertEqual(collist, columns)
299299
datalist = (
300300
object_fakes.container_bytes,
301301
object_fakes.container_count,
302302
object_fakes.container_name,
303303
)
304-
self.assertEqual(data, datalist)
304+
self.assertEqual(datalist, data)

‎openstackclient/tests/object/v1/test_container_all.py‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,25 @@
1515

1616
from requests_mock.contrib import fixture
1717

18-
from keystoneclient import session
19-
from openstackclient.api import object_store_v1 as object_store
20-
from openstackclient.object.v1 import container
18+
from openstackclient.object.v1 import container as container_cmds
2119
from openstackclient.tests.object.v1 import fakes as object_fakes
2220

2321

24-
class TestObjectAll(object_fakes.TestObjectv1):
22+
class TestContainerAll(object_fakes.TestObjectv1):
2523

2624
def setUp(self):
27-
super(TestObjectAll, self).setUp()
25+
super(TestContainerAll, self).setUp()
2826

29-
self.app.client_manager.session = session.Session()
3027
self.requests_mock = self.useFixture(fixture.Fixture())
3128

32-
# TODO(dtroyer): move this to object_fakes.TestObjectv1
33-
self.app.client_manager.object_store = object_store.APIv1(
34-
session=self.app.client_manager.session,
35-
endpoint=object_fakes.ENDPOINT,
36-
)
37-
3829

39-
class TestContainerCreate(TestObjectAll):
30+
class TestContainerCreate(TestContainerAll):
4031

4132
def setUp(self):
4233
super(TestContainerCreate, self).setUp()
4334

4435
# Get the command object to test
45-
self.cmd = container.CreateContainer(self.app, None)
36+
self.cmd = container_cmds.CreateContainer(self.app, None)
4637

4738
def test_object_create_container_single(self):
4839
self.requests_mock.register_uri(
@@ -115,13 +106,13 @@ def test_object_create_container_more(self):
115106
self.assertEqual(datalist, list(data))
116107

117108

118-
class TestContainerDelete(TestObjectAll):
109+
class TestContainerDelete(TestContainerAll):
119110

120111
def setUp(self):
121112
super(TestContainerDelete, self).setUp()
122113

123114
# Get the command object to test
124-
self.cmd = container.DeleteContainer(self.app, None)
115+
self.cmd = container_cmds.DeleteContainer(self.app, None)
125116

126117
def test_object_delete_container_single(self):
127118
self.requests_mock.register_uri(
@@ -168,13 +159,13 @@ def test_object_delete_container_more(self):
168159
self.assertIsNone(ret)
169160

170161

171-
class TestContainerList(TestObjectAll):
162+
class TestContainerList(TestContainerAll):
172163

173164
def setUp(self):
174165
super(TestContainerList, self).setUp()
175166

176167
# Get the command object to test
177-
self.cmd = container.ListContainer(self.app, None)
168+
self.cmd = container_cmds.ListContainer(self.app, None)
178169

179170
def test_object_list_containers_no_options(self):
180171
return_body = [
@@ -237,13 +228,13 @@ def test_object_list_containers_prefix(self):
237228
self.assertEqual(datalist, list(data))
238229

239230

240-
class TestContainerSave(TestObjectAll):
231+
class TestContainerSave(TestContainerAll):
241232

242233
def setUp(self):
243234
super(TestContainerSave, self).setUp()
244235

245236
# Get the command object to test
246-
self.cmd = container.SaveContainer(self.app, None)
237+
self.cmd = container_cmds.SaveContainer(self.app, None)
247238

248239
# TODO(dtroyer): need to mock out object_lib.save_object() to test this
249240
# def test_object_save_container(self):
@@ -285,13 +276,13 @@ def setUp(self):
285276
# self.assertIsNone(ret)
286277

287278

288-
class TestContainerShow(TestObjectAll):
279+
class TestContainerShow(TestContainerAll):
289280

290281
def setUp(self):
291282
super(TestContainerShow, self).setUp()
292283

293284
# Get the command object to test
294-
self.cmd = container.ShowContainer(self.app, None)
285+
self.cmd = container_cmds.ShowContainer(self.app, None)
295286

296287
def test_object_show_container(self):
297288
headers = {

‎openstackclient/tests/object/v1/test_object.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ def test_object_list_objects_no_options(self, o_mock):
6868
)
6969

7070
collist = ('Name',)
71-
self.assertEqual(columns, collist)
71+
self.assertEqual(collist, columns)
7272
datalist = (
7373
(object_fakes.object_name_1, ),
7474
(object_fakes.object_name_2, ),
7575
)
76-
self.assertEqual(tuple(data), datalist)
76+
self.assertEqual(datalist, tuple(data))
7777

7878
def test_object_list_objects_prefix(self, o_mock):
7979
o_mock.return_value = [
@@ -103,11 +103,11 @@ def test_object_list_objects_prefix(self, o_mock):
103103
)
104104

105105
collist = ('Name',)
106-
self.assertEqual(columns, collist)
106+
self.assertEqual(collist, columns)
107107
datalist = (
108108
(object_fakes.object_name_2, ),
109109
)
110-
self.assertEqual(tuple(data), datalist)
110+
self.assertEqual(datalist, tuple(data))
111111

112112
def test_object_list_objects_delimiter(self, o_mock):
113113
o_mock.return_value = [
@@ -137,11 +137,11 @@ def test_object_list_objects_delimiter(self, o_mock):
137137
)
138138

139139
collist = ('Name',)
140-
self.assertEqual(columns, collist)
140+
self.assertEqual(collist, columns)
141141
datalist = (
142142
(object_fakes.object_name_2, ),
143143
)
144-
self.assertEqual(tuple(data), datalist)
144+
self.assertEqual(datalist, tuple(data))
145145

146146
def test_object_list_objects_marker(self, o_mock):
147147
o_mock.return_value = [
@@ -171,11 +171,11 @@ def test_object_list_objects_marker(self, o_mock):
171171
)
172172

173173
collist = ('Name',)
174-
self.assertEqual(columns, collist)
174+
self.assertEqual(collist, columns)
175175
datalist = (
176176
(object_fakes.object_name_2, ),
177177
)
178-
self.assertEqual(tuple(data), datalist)
178+
self.assertEqual(datalist, tuple(data))
179179

180180
def test_object_list_objects_end_marker(self, o_mock):
181181
o_mock.return_value = [
@@ -205,11 +205,11 @@ def test_object_list_objects_end_marker(self, o_mock):
205205
)
206206

207207
collist = ('Name',)
208-
self.assertEqual(columns, collist)
208+
self.assertEqual(collist, columns)
209209
datalist = (
210210
(object_fakes.object_name_2, ),
211211
)
212-
self.assertEqual(tuple(data), datalist)
212+
self.assertEqual(datalist, tuple(data))
213213

214214
def test_object_list_objects_limit(self, o_mock):
215215
o_mock.return_value = [
@@ -239,11 +239,11 @@ def test_object_list_objects_limit(self, o_mock):
239239
)
240240

241241
collist = ('Name',)
242-
self.assertEqual(columns, collist)
242+
self.assertEqual(collist, columns)
243243
datalist = (
244244
(object_fakes.object_name_2, ),
245245
)
246-
self.assertEqual(tuple(data), datalist)
246+
self.assertEqual(datalist, tuple(data))
247247

248248
def test_object_list_objects_long(self, o_mock):
249249
o_mock.return_value = [
@@ -273,7 +273,7 @@ def test_object_list_objects_long(self, o_mock):
273273
)
274274

275275
collist = ('Name', 'Bytes', 'Hash', 'Content Type', 'Last Modified')
276-
self.assertEqual(columns, collist)
276+
self.assertEqual(collist, columns)
277277
datalist = (
278278
(
279279
object_fakes.object_name_1,
@@ -290,7 +290,7 @@ def test_object_list_objects_long(self, o_mock):
290290
object_fakes.object_modified_2,
291291
),
292292
)
293-
self.assertEqual(tuple(data), datalist)
293+
self.assertEqual(datalist, tuple(data))
294294

295295
def test_object_list_objects_all(self, o_mock):
296296
o_mock.return_value = [
@@ -321,12 +321,12 @@ def test_object_list_objects_all(self, o_mock):
321321
)
322322

323323
collist = ('Name',)
324-
self.assertEqual(columns, collist)
324+
self.assertEqual(collist, columns)
325325
datalist = (
326326
(object_fakes.object_name_1, ),
327327
(object_fakes.object_name_2, ),
328328
)
329-
self.assertEqual(tuple(data), datalist)
329+
self.assertEqual(datalist, tuple(data))
330330

331331

332332
@mock.patch(
@@ -367,12 +367,12 @@ def test_object_show(self, c_mock):
367367
)
368368

369369
collist = ('bytes', 'content_type', 'hash', 'last_modified', 'name')
370-
self.assertEqual(columns, collist)
370+
self.assertEqual(collist, columns)
371371
datalist = (
372372
object_fakes.object_bytes_1,
373373
object_fakes.object_content_type_1,
374374
object_fakes.object_hash_1,
375375
object_fakes.object_modified_1,
376376
object_fakes.object_name_1,
377377
)
378-
self.assertEqual(data, datalist)
378+
self.assertEqual(datalist, data)

0 commit comments

Comments
 (0)