yetangitu/photo-python
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into apiv1_fixes

Browse source 
Conflicts:
	tests/test_base.py
	tests/test_framework.py
This commit is contained in:
sneakypete81 2013-05-11 15:01:48 +01:00
commit c76ad3f181
8 changed files with 257 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/test_framework.py
View file

@ -10,17 +10,10 @@ class TestFramework(test_base.TestBase):
"""Override the default setUp, since we don't need a populated database"""
logging.info("\nRunning %s..." % self.id())
def create_client_from_base(self, api_version):
return openphoto.OpenPhoto(self.client._host,
self.client._consumer_key,
self.client._consumer_secret,
self.client._token,
self.client._token_secret,
api_version=api_version)
def test_api_version_zero(self):
# API v0 has a special hello world message
client = self.create_client_from_base(api_version=0)
client = openphoto.OpenPhoto(config_file=self.config_file,
api_version=0)
result = client.get("hello.json")
self.assertEqual(result['message'], "Hello, world! This is version zero of the API!")
self.assertEqual(result['result']['__route__'], "/v0/hello.json")
@ -28,14 +21,16 @@ class TestFramework(test_base.TestBase):
def test_specified_api_version(self):
# For all API versions >0, we get a generic hello world message
for api_version in range(1, test_base.get_test_server_api() + 1):
client = self.create_client_from_base(api_version=api_version)
client = openphoto.OpenPhoto(config_file=self.config_file,
api_version=api_version)
result = client.get("hello.json")
self.assertEqual(result['message'], "Hello, world!")
self.assertEqual(result['result']['__route__'], "/v%d/hello.json" % api_version)
def test_unspecified_api_version(self):
# If the API version is unspecified, we get a generic hello world message
client = self.create_client_from_base(api_version=None)
client = openphoto.OpenPhoto(config_file=self.config_file,
api_version=None)
result = client.get("hello.json")
self.assertEqual(result['message'], "Hello, world!")
self.assertEqual(result['result']['__route__'], "/hello.json")
@ -43,6 +38,7 @@ class TestFramework(test_base.TestBase):
def test_future_api_version(self):
# If the API version is unsupported, we should get an error
# (it's a ValueError, since the returned 404 HTML page is not valid JSON)
client = self.create_client_from_base(api_version=openphoto.LATEST_API_VERSION + 1)
client = openphoto.OpenPhoto(config_file=self.config_file,
api_version=openphoto.LATEST_API_VERSION + 1)
with self.assertRaises(openphoto.OpenPhoto404Error):
client.get("hello.json")