Merge branch 'sneakypete81-test_fixes' into development

run_functional_tests

@@ -42,3 +42,12 @@ export TROVEBOX_TEST_CONFIG=test-hosted
 unset TROVEBOX_TEST_SERVER_API
 python -m unittest discover --catch tests/functional
 
+# Test account on hosted trovebox.com site over HTTPS
+tput setaf 3
+echo
+echo "Testing latest hosted site over HTTPS..."
+tput sgr0
+export TROVEBOX_TEST_CONFIG=test-hosted-https
+unset TROVEBOX_TEST_SERVER_API
+python -m unittest discover --catch tests/functional
+

tests/functional/README.markdown

@@ -102,4 +102,5 @@ config files containing your credentials:
     test              : Latest self-hosted site (from photo/frontend master branch)
     test-apiv1        : APIv1 self-hosted site (from photo/frontend commit 660b2ab)
     test-3.0.8        : v3.0.8 self-hosted site (from photo/frontend commit e9d81de57b)
-    test-hosted : Credentials for test account on trovebox.com
+    test-hosted       : Credentials for test account on http://<xxxx>.trovebox.com
+    test-hosted-https : Same as test-hosted, but with https://

tests/functional/__init__.py

@@ -0,0 +1,2 @@
+# __init__.py
+

tests/functional/api_versions/__init__.py

@@ -0,0 +1,2 @@
+# __init__.py
+

tests/functional/api_versions/test_v1.py

@@ -1,5 +1,12 @@
+from tests.functional import test_activities, test_actions
 from tests.functional import test_albums, test_photos, test_tags
 
+class TestActivitiesV1(test_activities.TestActivities):
+    api_version = 1
+
+class TestActionsV1(test_actions.TestActions):
+    api_version = 1
+
 class TestAlbumsV1(test_albums.TestAlbums):
     api_version = 1
 

tests/functional/api_versions/test_v2.py

@@ -2,7 +2,19 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-from tests.functional import test_base, test_albums, test_photos, test_tags
+
+from tests.functional import test_base, test_activities, test_actions
+from tests.functional import test_albums, test_photos, test_tags
+
+@unittest.skipIf(test_base.get_test_server_api() < 2,
+                 "Don't test future API versions")
+class TestActivitiesV2(test_activities.TestActivities):
+    api_version = 2
+
+@unittest.skipIf(test_base.get_test_server_api() < 2,
+                 "Don't test future API versions")
+class TestActionsV2(test_actions.TestActions):
+    api_version = 2
 
 @unittest.skipIf(test_base.get_test_server_api() < 2,
                  "Don't test future API versions")

tests/functional/test_activities.py

@@ -8,6 +8,8 @@ from tests.functional import test_base
 class TestActivities(test_base.TestBase):
     testcase_name = "activity API"
 
+    @unittest.skipIf(test_base.get_test_server_api() == 1,
+                     "The activity/list endpoint behaves differenty at v1")
     def test_list(self):
         """
         Upload three photos, and check that three corresponding activities

tests/functional/test_base.py

@@ -42,8 +42,8 @@ class TestBase(unittest.TestCase):
             else:
                 print("\nTesting %s v%d" % (cls.testcase_name, cls.api_version))
 
-        cls.client = trovebox.Trovebox(config_file=cls.config_file,
+        cls.client = trovebox.Trovebox(config_file=cls.config_file)
-                                         api_version=cls.api_version)
+        cls.client.configure(api_version=cls.api_version)
 
         if cls.client.photos.list() != []:
             raise ValueError("The test server (%s) contains photos. "

tests/functional/test_framework.py

@@ -16,8 +16,8 @@ class TestFramework(test_base.TestBase):
         """
         API v0 has a special hello world message
         """
-        client = trovebox.Trovebox(config_file=self.config_file,
+        client = trovebox.Trovebox(config_file=self.config_file)
-                                   api_version=0)
+        client.configure(api_version=0)
         result = client.get("hello.json")
         self.assertEqual(result['message'],
                          "Hello, world! This is version zero of the API!")
@@ -28,8 +28,8 @@ class TestFramework(test_base.TestBase):
         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 = trovebox.Trovebox(config_file=self.config_file,
+            client = trovebox.Trovebox(config_file=self.config_file)
-                                       api_version=api_version)
+            client.configure(api_version=api_version)
             result = client.get("hello.json")
             self.assertEqual(result['message'], "Hello, world!")
             self.assertEqual(result['result']['__route__'],
@@ -40,8 +40,7 @@ class TestFramework(test_base.TestBase):
         If the API version is unspecified,
         we get a generic hello world message.
         """
-        client = trovebox.Trovebox(config_file=self.config_file,
+        client = trovebox.Trovebox(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")
@@ -52,7 +51,7 @@ class TestFramework(test_base.TestBase):
         (ValueError, since the returned 404 HTML page is not valid JSON)
         """
         version = trovebox.LATEST_API_VERSION + 1
-        client = trovebox.Trovebox(config_file=self.config_file,
+        client = trovebox.Trovebox(config_file=self.config_file)
-                                   api_version=version)
+        client.configure(api_version=version)
         with self.assertRaises(trovebox.Trovebox404Error):
             client.get("hello.json")