Squash some test bugs

Author: cmlccie

tests/api/test_people.py

@@ -8,6 +8,7 @@
 import pytest
 
 import ciscosparkapi
+from tests.conftest import TEST_FILE_URL
 
 
 # Helper Functions
@@ -77,7 +78,7 @@ class TestPeople(object):
     """Creates, tracks and manages test accounts 'people' used by the tests."""
 
     def __init__(self, api, get_new_email_address, licenses_dict):
-        super(object, TestPeople).__init__()
+        super(TestPeople, self).__init__()
         self._api = api
         self._get_new_email_address = get_new_email_address
         self._licenses_dict = licenses_dict
@@ -106,7 +107,7 @@ def __iter__(self):
     def __del__(self):
         for person in self.test_people.values():
             delete_person(self._api, person)
-        super(object, TestPeople).__del__()
+            pass
 
 
 # pytest Fixtures
@@ -183,7 +184,7 @@ def test_list_people_with_paging(self, api, test_people,
         page_size = 1
         pages = 3
         num_people = pages * page_size
-        assert len(test_people) >= num_people
+        assert test_people.len() >= num_people
         display_name = test_people["not_a_member"].displayName
         people = api.people.list(displayName=display_name, max=page_size)
         people_list = list(itertools.islice(people, num_people))

tests/api/test_teammemberships.py

@@ -48,13 +48,13 @@ def empty_team(api, me, team):
             delete_membership(api, membership)
 
 
-def is_valid_membership(membership):
+def is_valid_team_membership(membership):
     return isinstance(membership, ciscosparkapi.TeamMembership) \
            and membership.id is not None
 
 
-def are_valid_memberships(iterable):
-    are_valid = (is_valid_membership(item) for item in iterable)
+def are_valid_team_memberships(iterable):
+    are_valid = (is_valid_team_membership(item) for item in iterable)
     return all(are_valid)
 
 
@@ -69,17 +69,21 @@ def membership_exists(api, membership):
 
 # pytest Fixtures
 
-@pytest.fixture()
-def my_team_team_membership(api, me, team):
+@pytest.fixture(scope="session")
+def my_team_membership(api, me, team):
     team_memberships = get_team_membership_list(api, team)
     for membership in team_memberships:
         if membership.personId == me.id:
             return membership
 
-
-@pytest.fixture(scope="session")
-def authenticated_user_team_memberships(api, team):
-    return list(api.team_memberships.list())
+# Cisco Spark API Documentation says that you should be able to retrieve a list
+# of all of your team memberships; however, calling the API endpoint without
+# specifying a teamId returns an error (and the docs say that a teamId is
+# required).  #DocumentationBug
+# TODO: Report documentation / API bug on retrieving a user's team memberships
+# @pytest.fixture(scope="session")
+# def authenticated_user_team_memberships(api, team):
+#     return list(api.team_memberships.list())
 
 
 @pytest.fixture(scope="session")
@@ -173,33 +177,33 @@ def test_list_user_team_memberships_with_paging(self, api, add_teams,
         assert are_valid_memberships(memberships_list)
 
     def test_create_team_membership_by_email(self, team_member_added_by_email):
-        assert is_valid_membership(team_member_added_by_email)
+        assert is_valid_team_membership(team_member_added_by_email)
 
     def test_create_team_membership_by_person_id(self,
                                                  team_member_added_by_id):
-        assert is_valid_membership(team_member_added_by_id)
+        assert is_valid_team_membership(team_member_added_by_id)
 
     def test_create_team_moderator_by_email(self,
                                             team_moderator_added_by_email):
-        assert is_valid_membership(team_moderator_added_by_email)
+        assert is_valid_team_membership(team_moderator_added_by_email)
 
     def test_create_team_moderator_by_person_id(self,
                                                 team_moderator_added_by_id):
-        assert is_valid_membership(team_moderator_added_by_id)
+        assert is_valid_team_membership(team_moderator_added_by_id)
 
     def test_update_membership_make_moderator(self,
                                               make_me_team_moderator):
-        assert is_valid_membership(make_me_team_moderator)
+        assert is_valid_team_membership(make_me_team_moderator)
         assert make_me_team_moderator.isModerator
 
     def test_delete_membership(self, api, team, test_people):
         person = test_people["not_a_member"]
         membership = add_person_to_team_by_id(api, team, person)
-        assert is_valid_membership(membership)
+        assert is_valid_team_membership(membership)
         delete_membership(api, membership)
         assert not membership_exists(api, membership)
 
     def test_list_team_memberships(self, api, team_with_members):
         team_memberships = get_team_membership_list(api, team_with_members)
         assert len(team_memberships) > 1
-        assert are_valid_memberships(team_memberships)
+        assert are_valid_team_memberships(team_memberships)

tests/api/test_teams.py

@@ -17,7 +17,7 @@ def create_team(api, name):
     return api.teams.create(name)
 
 
-def get_team_details_by_id(self, api, team_id):
+def get_team_details_by_id(api, team_id):
     team = api.teams.get(team_id)
     return team
 
@@ -92,7 +92,7 @@ def test_create_team(self, team):
         assert is_valid_team(team)
 
     def test_get_team_details(self, api, team):
-        team = get_team_details_by_id(team.id)
+        team = get_team_details_by_id(api, team.id)
         assert is_valid_team(team)
 
     def test_update_team_name(self, api, team):
@@ -105,7 +105,7 @@ def test_delete_team(self, api, temp_team):
         api.teams.delete(temp_team.id)
         assert not team_exists(api, temp_team)
 
-    def test_list_teams(self, api, teams_list):
+    def test_list_teams(self, teams_list):
         assert len(teams_list) > 0
         assert are_valid_teams(teams_list)
 

tests/conftest.py

@@ -2,10 +2,14 @@
 """pytest configuration and top-level fixtures."""
 
 
+import os
 import string
+import tempfile
 
 import pytest
 
+from tests.utils import download_file
+
 
 pytest_plugins = [
     'tests.test_ciscosparkapi',
@@ -24,13 +28,15 @@
 
 
 TEST_DOMAIN = "cmlccie.com"
+TEST_FILE_URL = "https://developer.ciscospark.com/images/logo_spark_lg@256.png"
+
 
 email_template = string.Template("test${number}@" + TEST_DOMAIN)
 
 
 # Helper Functions
 def new_email_generator():
-    i = 0
+    i = 50
     while True:
         email_address = email_template.substitute(number=i)
         i += 1