From 016792b65306c321c351fd83a44fdfec9f156d3f Mon Sep 17 00:00:00 2001
From: sneakypete81 <sneakypete81@gmail.com>
Date: Sun, 1 Sep 2013 18:52:42 +0100
Subject: [PATCH] Updated functional tests to run Actions and Activities on all
 API versions

---
 tests/functional/__init__.py              |  2 ++
 tests/functional/api_versions/__init__.py |  2 ++
 tests/functional/api_versions/test_v1.py  |  7 +++++++
 tests/functional/api_versions/test_v2.py  | 14 +++++++++++++-
 tests/functional/test_activities.py       |  2 ++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
index e69de29..651585a 100644
--- a/tests/functional/__init__.py
+++ b/tests/functional/__init__.py
@@ -0,0 +1,2 @@
+# __init__.py
+
diff --git a/tests/functional/api_versions/__init__.py b/tests/functional/api_versions/__init__.py
index e69de29..651585a 100644
--- a/tests/functional/api_versions/__init__.py
+++ b/tests/functional/api_versions/__init__.py
@@ -0,0 +1,2 @@
+# __init__.py
+
diff --git a/tests/functional/api_versions/test_v1.py b/tests/functional/api_versions/test_v1.py
index aa3c652..621602d 100644
--- a/tests/functional/api_versions/test_v1.py
+++ b/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
 
diff --git a/tests/functional/api_versions/test_v2.py b/tests/functional/api_versions/test_v2.py
index a2c425c..80b204e 100644
--- a/tests/functional/api_versions/test_v2.py
+++ b/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")
diff --git a/tests/functional/test_activities.py b/tests/functional/test_activities.py
index a935fa7..1475235 100644
--- a/tests/functional/test_activities.py
+++ b/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