Revision 7a3c66e1 kamaki/clients/pithos/test.py

b/kamaki/clients/pithos/test.py
197 197
    @patch('%s.set_header' % rest_pkg)
198 198
    @patch('%s.get' % rest_pkg, return_value=FR())
199 199
    def test_account_get(self, get, SH, SP):
200
        keys = ('limit', 'marker', 'format', 'shared', 'until')
200
        keys = ('limit', 'marker', 'format', 'shared', 'public', 'until')
201 201
        for params in product(
202 202
                (None, 42),
203 203
                (None, 'X'),
204 204
                ('json', 'xml'),
205 205
                (False, True),
206
                (False, True),
206 207
                (None, '50m3-d473'),
207 208
                (None, '50m3-07h3r-d473'),
208 209
                (None, 'y37-4n7h3r-d473'),
......
211 212
            args, kwargs = params[-2], params[-1]
212 213
            params = params[:-2]
213 214
            self.client.account_get(*(params + args), **kwargs)
214
            self.assertEqual(SP.mock_calls[-5:],
215
                [call(keys[i], iff=X) if (
216
                    i == 3) else call(
217
                        keys[i], X, iff=X) for i, X in enumerate(params[:5])])
218
            IMS, IUS = params[5], params[6]
215
            self.assertEqual(SP.mock_calls[-6:],
216
                [call(keys[i], iff=X) if (i in (3, 4)) else call(
217
                    keys[i], X, iff=X) for i, X in enumerate(params[:6])])
218
            IMS, IUS = params[6], params[7]
219 219
            self.assertEqual(SH.mock_calls[-2:], [
220 220
                call('If-Modified-Since', IMS),
221 221
                call('If-Unmodified-Since', IUS)])
......
297 297
                ('json', 'some-format'),
298 298
                ([], ['k1', 'k2', 'k3']),
299 299
                (False, True),
300
                (False, True),
300 301
                (None, 'unt1l-d473'),
301 302
                (None, 'y37-4n47h3r'),
302 303
                (None, '4n47h3r-d473'),
......
305 306
            args, kwargs = pm[-2:]
306 307
            pm = pm[:-2]
307 308
            self.client.container_get(*(pm + args), **kwargs)
308
            lmt, mrk, prfx, dlm, path, frmt, meta, shr, unt = pm[:-2]
309
            lmt, mrk, prfx, dlm, path, frmt, meta, shr, pbl, unt = pm[:-2]
309 310
            exp = [call('limit', lmt, iff=lmt), call('marker', mrk, iff=mrk)]
310 311
            exp += [call('path', path)] if path else [
311 312
                call('prefix', prfx, iff=prfx),
312 313
                call('delimiter', dlm, iff=dlm)]
313
            exp += [call('format', frmt, iff=frmt), call('shared', iff=shr)]
314
            exp += [
315
                call('format', frmt, iff=frmt),
316
                call('shared', iff=shr),
317
                call('public', iff=pbl)]
314 318
            if meta:
315 319
                exp += [call('meta', ','.join(meta))]
316 320
            exp += [call('until', unt, iff=unt)]

Also available in: Unified diff