fixed pep8 warnings, updated some comments - moved swift.common.client.Connection's http_connection call into the class next to get_auth
This commit is contained in:
Clay Gerrard
@@ -13,16 +13,366 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# TODO: Tests
|
||||
|
||||
# TODO: More tests
|
||||
import unittest
|
||||
from swift.common import client
|
||||
|
||||
class TestAuditor(unittest.TestCase):
|
||||
# TODO: mock http connection class with more control over headers
|
||||
from test.unit.proxy.test_server import fake_http_connect
|
||||
|
||||
def test_placeholder(self):
|
||||
pass
|
||||
from swift.common import client as c
|
||||
|
||||
|
||||
class TestHttpHelpers(unittest.TestCase):
|
||||
|
||||
def test_quote(self):
|
||||
value = 'standard string'
|
||||
self.assertEquals('standard%20string', c.quote(value))
|
||||
value = u'\u0075nicode string'
|
||||
self.assertEquals('unicode%20string', c.quote(value))
|
||||
|
||||
def test_http_connection(self):
|
||||
url = 'http://www.test.com'
|
||||
_, conn = c.http_connection(url)
|
||||
self.assertTrue(isinstance(conn, c.HTTPConnection))
|
||||
url = 'https://www.test.com'
|
||||
_, conn = c.http_connection(url)
|
||||
self.assertTrue(isinstance(conn, c.HTTPSConnection))
|
||||
url = 'ftp://www.test.com'
|
||||
self.assertRaises(c.ClientException, c.http_connection, url)
|
||||
|
||||
|
||||
class TestClientException(unittest.TestCase):
|
||||
|
||||
def test_is_exception(self):
|
||||
self.assertTrue(issubclass(c.ClientException, Exception))
|
||||
|
||||
def test_format(self):
|
||||
exc = c.ClientException('something failed')
|
||||
self.assertTrue('something failed' in str(exc))
|
||||
test_kwargs = (
|
||||
'scheme',
|
||||
'host',
|
||||
'port',
|
||||
'path',
|
||||
'query',
|
||||
'status',
|
||||
'reason',
|
||||
'device',
|
||||
)
|
||||
for value in test_kwargs:
|
||||
kwargs = {
|
||||
'http_%s' % value: value,
|
||||
}
|
||||
exc = c.ClientException('test', **kwargs)
|
||||
self.assertTrue(value in str(exc))
|
||||
|
||||
|
||||
class TestJsonImport(unittest.TestCase):
|
||||
|
||||
def tearDown(self):
|
||||
try:
|
||||
import json
|
||||
except ImportError:
|
||||
pass
|
||||
else:
|
||||
reload(json)
|
||||
|
||||
try:
|
||||
import simplejson
|
||||
except ImportError:
|
||||
pass
|
||||
else:
|
||||
reload(simplejson)
|
||||
|
||||
def test_any(self):
|
||||
self.assertTrue(hasattr(c, 'json_loads'))
|
||||
|
||||
def test_no_simplejson(self):
|
||||
# break simplejson
|
||||
try:
|
||||
import simplejson
|
||||
except ImportError:
|
||||
# not installed, so we don't have to break it for these tests
|
||||
pass
|
||||
else:
|
||||
delattr(simplejson, 'loads')
|
||||
reload(c)
|
||||
|
||||
try:
|
||||
from json import loads
|
||||
except ImportError:
|
||||
# this case is stested in _no_json
|
||||
pass
|
||||
else:
|
||||
self.assertEquals(loads, c.json_loads)
|
||||
|
||||
def test_no_json(self):
|
||||
# first break simplejson
|
||||
try:
|
||||
import simplejson
|
||||
except ImportError:
|
||||
# not installed, so we don't have to break it for these tests
|
||||
pass
|
||||
else:
|
||||
delattr(simplejson, 'loads')
|
||||
|
||||
# then break json
|
||||
try:
|
||||
import json
|
||||
except ImportError:
|
||||
# not installed, so we don't have to break it for these tests
|
||||
_orig_dumps = None
|
||||
else:
|
||||
# before we break json, grab a copy of the orig_dumps function
|
||||
_orig_dumps = json.dumps
|
||||
delattr(json, 'loads')
|
||||
reload(c)
|
||||
|
||||
if _orig_dumps:
|
||||
# basic test of swift.common.client.json_loads using json.loads
|
||||
data = {
|
||||
'string': 'value',
|
||||
'int': 0,
|
||||
'bool': True,
|
||||
'none': None,
|
||||
}
|
||||
json_string = _orig_dumps(data)
|
||||
else:
|
||||
# even more basic test using a hand encoded json string
|
||||
data = ['value1', 'value2']
|
||||
json_string = "['value1', 'value2']"
|
||||
|
||||
self.assertEquals(data, c.json_loads(json_string))
|
||||
self.assertRaises(AttributeError, c.json_loads, self)
|
||||
|
||||
|
||||
class MockHttpTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
def fake_http_connection(*args, **kwargs):
|
||||
_orig_http_connection = c.http_connection
|
||||
|
||||
def wrapper(url):
|
||||
parsed, _conn = _orig_http_connection(url)
|
||||
conn = fake_http_connect(*args, **kwargs)()
|
||||
|
||||
def request(*args, **kwargs):
|
||||
return
|
||||
conn.request = request
|
||||
|
||||
conn.has_been_read = False
|
||||
_orig_read = conn.read
|
||||
|
||||
def read(*args, **kwargs):
|
||||
conn.has_been_read = True
|
||||
return _orig_read(*args, **kwargs)
|
||||
conn.read = read
|
||||
|
||||
return parsed, conn
|
||||
return wrapper
|
||||
self.fake_http_connection = fake_http_connection
|
||||
|
||||
def tearDown(self):
|
||||
reload(c)
|
||||
|
||||
# TODO: following tests are placeholders, need more tests, better coverage
|
||||
|
||||
|
||||
class TestGetAuth(MockHttpTest):
|
||||
|
||||
def test_ok(self):
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
url, token = c.get_auth('http://www.test.com', 'asdf', 'asdf')
|
||||
self.assertEquals(url, None)
|
||||
self.assertEquals(token, None)
|
||||
|
||||
|
||||
class TestGetAccount(MockHttpTest):
|
||||
|
||||
def test_no_content(self):
|
||||
c.http_connection = self.fake_http_connection(204)
|
||||
value = c.get_account('http://www.test.com', 'asdf')
|
||||
self.assertEquals(value, [])
|
||||
|
||||
|
||||
class TestHeadAccount(MockHttpTest):
|
||||
|
||||
def test_ok(self):
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
value = c.head_account('http://www.tests.com', 'asdf')
|
||||
self.assertEquals(value, (0, 0, 0))
|
||||
|
||||
def test_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
self.assertRaises(c.ClientException, c.head_account,
|
||||
'http://www.tests.com', 'asdf')
|
||||
|
||||
|
||||
class TestGetContainer(MockHttpTest):
|
||||
|
||||
def test_no_content(self):
|
||||
c.http_connection = self.fake_http_connection(204)
|
||||
value = c.get_container('http://www.test.com', 'asdf', 'asdf')
|
||||
self.assertEquals(value, [])
|
||||
|
||||
|
||||
class TestHeadContainer(MockHttpTest):
|
||||
|
||||
def test_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
self.assertRaises(c.ClientException, c.head_container,
|
||||
'http://www.test.com', 'asdf', 'asdf',
|
||||
)
|
||||
|
||||
|
||||
class TestPutContainer(MockHttpTest):
|
||||
|
||||
def test_ok(self):
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
value = c.put_container('http://www.test.com', 'asdf', 'asdf')
|
||||
self.assertEquals(value, None)
|
||||
|
||||
|
||||
class TestDeleteContainer(MockHttpTest):
|
||||
|
||||
def test_ok(self):
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
value = c.delete_container('http://www.test.com', 'asdf', 'asdf')
|
||||
self.assertEquals(value, None)
|
||||
|
||||
|
||||
class TestGetObject(MockHttpTest):
|
||||
|
||||
def test_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
self.assertRaises(c.ClientException, c.get_object,
|
||||
'http://www.test.com', 'asdf', 'asdf', 'asdf')
|
||||
|
||||
|
||||
class TestHeadObject(MockHttpTest):
|
||||
|
||||
def test_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
self.assertRaises(c.ClientException, c.head_object,
|
||||
'http://www.test.com', 'asdf', 'asdf', 'asdf')
|
||||
|
||||
|
||||
class TestPutObject(MockHttpTest):
|
||||
|
||||
def test_ok(self):
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
args = ('http://www.test.com', 'asdf', 'asdf', 'asdf', 'asdf')
|
||||
value = c.put_object(*args)
|
||||
self.assertTrue(isinstance(value, basestring))
|
||||
|
||||
def test_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
args = ('http://www.test.com', 'asdf', 'asdf', 'asdf', 'asdf')
|
||||
self.assertRaises(c.ClientException, c.put_object, *args)
|
||||
|
||||
|
||||
class TestPostObject(MockHttpTest):
|
||||
|
||||
def test_ok(self):
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
args = ('http://www.test.com', 'asdf', 'asdf', 'asdf', {})
|
||||
value = c.post_object(*args)
|
||||
|
||||
def test_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
self.assertRaises(c.ClientException, c.post_object,
|
||||
'http://www.test.com', 'asdf', 'asdf', 'asdf', {})
|
||||
|
||||
|
||||
class TestDeleteObject(MockHttpTest):
|
||||
|
||||
def test_ok(self):
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
value = c.delete_object('http://www.test.com', 'asdf', 'asdf', 'asdf')
|
||||
|
||||
def test_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
self.assertRaises(c.ClientException, c.delete_object,
|
||||
'http://www.test.com', 'asdf', 'asdf', 'asdf')
|
||||
|
||||
|
||||
class TestConnection(MockHttpTest):
|
||||
|
||||
def test_instance(self):
|
||||
conn = c.Connection('http://www.test.com', 'asdf', 'asdf')
|
||||
self.assertEquals(conn.retries, 5)
|
||||
|
||||
def test_retry(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
|
||||
def quick_sleep(*args):
|
||||
pass
|
||||
c.sleep = quick_sleep
|
||||
conn = c.Connection('http://www.test.com', 'asdf', 'asdf')
|
||||
self.assertRaises(c.ClientException, conn.head_account)
|
||||
self.assertEquals(conn.attempts, conn.retries + 1)
|
||||
|
||||
def test_resp_read_on_server_error(self):
|
||||
c.http_connection = self.fake_http_connection(500)
|
||||
conn = c.Connection('http://www.test.com', 'asdf', 'asdf', retries=0)
|
||||
|
||||
def get_auth(*args, **kwargs):
|
||||
return 'http://www.new.com', 'new'
|
||||
conn.get_auth = get_auth
|
||||
self.url, self.token = conn.get_auth()
|
||||
|
||||
method_signatures = (
|
||||
(conn.head_account, []),
|
||||
(conn.get_account, []),
|
||||
(conn.head_container, ('asdf',)),
|
||||
(conn.get_container, ('asdf',)),
|
||||
(conn.put_container, ('asdf',)),
|
||||
(conn.delete_container, ('asdf',)),
|
||||
(conn.head_object, ('asdf', 'asdf')),
|
||||
(conn.get_object, ('asdf', 'asdf')),
|
||||
(conn.put_object, ('asdf', 'asdf', 'asdf')),
|
||||
(conn.post_object, ('asdf', 'asdf', {})),
|
||||
(conn.delete_object, ('asdf', 'asdf')),
|
||||
)
|
||||
|
||||
for method, args in method_signatures:
|
||||
self.assertRaises(c.ClientException, method, *args)
|
||||
try:
|
||||
self.assertTrue(conn.http_conn[1].has_been_read)
|
||||
except AssertionError:
|
||||
msg = '%s did not read resp on server error' % method.__name__
|
||||
self.fail(msg)
|
||||
except Exception, e:
|
||||
raise e.__class__("%s - %s" % (method.__name__, e))
|
||||
|
||||
def test_reauth(self):
|
||||
c.http_connection = self.fake_http_connection(401)
|
||||
|
||||
def get_auth(*args, **kwargs):
|
||||
return 'http://www.new.com', 'new'
|
||||
|
||||
def swap_sleep(*args):
|
||||
self.swap_sleep_called = True
|
||||
c.get_auth = get_auth
|
||||
c.http_connection = self.fake_http_connection(200)
|
||||
c.sleep = swap_sleep
|
||||
self.swap_sleep_called = False
|
||||
|
||||
conn = c.Connection('http://www.test.com', 'asdf', 'asdf',
|
||||
preauthurl='http://www.old.com',
|
||||
preauthtoken='old',
|
||||
)
|
||||
|
||||
self.assertEquals(conn.attempts, 0)
|
||||
self.assertEquals(conn.url, 'http://www.old.com')
|
||||
self.assertEquals(conn.token, 'old')
|
||||
|
||||
value = conn.head_account()
|
||||
|
||||
self.assertTrue(self.swap_sleep_called)
|
||||
self.assertEquals(conn.attempts, 2)
|
||||
self.assertEquals(conn.url, 'http://www.new.com')
|
||||
self.assertEquals(conn.token, 'new')
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user