From e3b8f796bbe4785ee03cbd5dc8609045474ea40c Mon Sep 17 00:00:00 2001 From: Stavros Sachtouris Date: Wed, 13 Mar 2013 15:14:47 +0200 Subject: [PATCH] Finetest and move Storage.list_objects_in_path --- kamaki/clients/pithos/test.py | 34 ---------------------------------- kamaki/clients/storage/test.py | 11 ++++------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/kamaki/clients/pithos/test.py b/kamaki/clients/pithos/test.py index 68c2c52..5f9e167 100644 --- a/kamaki/clients/pithos/test.py +++ b/kamaki/clients/pithos/test.py @@ -428,40 +428,6 @@ class Pithos(TestCase): for k, v in kwargs.items(): self.assertEqual(v, put.mock_calls[-1][2][k]) - @patch('%s.get' % pithos_pkg, return_value=FR()) - @patch('%s.set_param' % pithos_pkg) - def test_list_objects(self, SP, get): - FR.json = object_list - acc = self.client.account - cont = self.client.container - SP = PC.set_param - r = self.client.list_objects() - for i in range(len(r)): - self.assert_dicts_are_equal(r[i], object_list[i]) - self.assertEqual(get.mock_calls, [ - call('/%s/%s' % (acc, cont), success=(200, 204, 304, 404))]) - self.assertEqual(SP.mock_calls, [call('format', 'json')]) - FR.status_code = 304 - self.assertEqual(self.client.list_objects(), []) - FR.status_code = 404 - self.assertRaises(ClientError, self.client.list_objects) - - @patch('%s.get' % pithos_pkg, return_value=FR()) - @patch('%s.set_param' % pithos_pkg) - def test_list_objects_in_path(self, SP, get): - FR.json = object_list - path = '/some/awsome/path' - acc = self.client.account - cont = self.client.container - SP = PC.set_param - self.client.list_objects_in_path(path) - self.assertEqual(get.mock_calls, [ - call('/%s/%s' % (acc, cont), success=(200, 204, 404))]) - self.assertEqual(SP.mock_calls, [ - call('format', 'json'), call('path', path)]) - FR.status_code = 404 - self.assertRaises(ClientError, self.client.list_objects) - # Pithos+ only methods @patch('%s.container_delete' % pithos_pkg, return_value=FR()) diff --git a/kamaki/clients/storage/test.py b/kamaki/clients/storage/test.py index f00191a..105a0eb 100644 --- a/kamaki/clients/storage/test.py +++ b/kamaki/clients/storage/test.py @@ -418,23 +418,20 @@ class Storage(TestCase): FR.status_code = 404 self.assertRaises(ClientError, self.client.list_objects) - """ @patch('%s.get' % client_pkg, return_value=FR()) @patch('%s.set_param' % client_pkg) def test_list_objects_in_path(self, SP, get): FR.json = object_list path = '/some/awsome/path' - acc = self.client.account - cont = self.client.container - SP = PC.set_param + acc, cont = self.client.account, self.client.container self.client.list_objects_in_path(path) - self.assertEqual(get.mock_calls, [ - call('/%s/%s' % (acc, cont), success=(200, 204, 404))]) + self.assertEqual( + get.mock_calls[-1], + call('/%s/%s' % (acc, cont), success=(200, 204, 404))) self.assertEqual(SP.mock_calls, [ call('format', 'json'), call('path', path)]) FR.status_code = 404 self.assertRaises(ClientError, self.client.list_objects) - """ if __name__ == '__main__': from sys import argv -- 1.7.10.4