Update tox testing advice.

braincore · braincore · commit 76536ae67ef7 · 2016-05-25T13:58:53.000-07:00
diff --git a/README.rst b/README.rst
@@ -58,14 +58,28 @@ To ease the transition to the new API and SDK, you can still use the old
 simultaneously.  Support for the old client will be dropped once the new SDK is
 at functional parity.
 
-Running tests
--------------
+Testing
+-------
 
 We use the `tox <https://tox.readthedocs.org/>`_ package to run tests in Python
 2 and 3. To install, use :code:`pip install tox`. Once installed, run `tox` from the
 root directory. You'll need to specify a working Dropbox OAuth2 token:
 
 .. code-block:: bash
 
-    $ DROPBOX_TOKEN=YOUR_TOKEN tox
+    $ DROPBOX_TOKEN=YOUR_TOKEN tox -- -k "'not test_team'"
+
+Note that we skip ``test_team`` which requires a team token with `Member File Access
+<https://www.dropbox.com/developers/documentation/http/teams#teams-member-file-access>`_.
+To test this functionality, specify a ``DROPBOX_TEAM_TOKEN`` environment
+variable.
+
+.. code-block:: bash
+
+    $ DROPBOX_TOKEN=... DROPBOX_TEAM_TOKEN=... tox
+
+If you only want to test the API v2 client, use:
+
+.. code-block:: bash
 
+    $ DROPBOX_TOKEN=... DROPBOX_TEAM_TOKEN=... tox -- -k TestDropbox
diff --git a/test/test_dropbox.py b/test/test_dropbox.py
@@ -27,14 +27,20 @@
           file=sys.stderr)
     sys.exit(1)
 
-# Get team token from environment variable.
-# This team needs to have sufficient permission to get team information
-# and assume user identities.
-team_oauth2_token = os.environ.get('DROPBOX_TEAM_TOKEN')
-if team_oauth2_token is None:
-    print('Set DROPBOX_TEAM_TOKEN environment variable to a valid token.',
-          file=sys.stderr)
-    sys.exit(1)
+
+def require_team_token(f):
+    def inner(*args, **kwargs):
+        # Get team token from environment variable.
+        # This team needs to have sufficient permission to get team information
+        # and assume user identities.
+        team_oauth2_token = os.environ.get('DROPBOX_TEAM_TOKEN')
+        if team_oauth2_token is None:
+            print('Set DROPBOX_TEAM_TOKEN environment variable to a valid token.',
+                  file=sys.stderr)
+            sys.exit(1)
+        return f(team_oauth2_token, *args, **kwargs)
+    return inner
+
 
 MALFORMED_TOKEN = 'asdf'
 INVALID_TOKEN = 'z' * 62
@@ -44,7 +50,6 @@ class TestDropbox(unittest.TestCase):
 
     def setUp(self):
         self.dbx = Dropbox(oauth2_token)
-        self.dbxt = DropboxTeam(team_oauth2_token)
 
     def test_bad_auth(self):
         # Test malformed token
@@ -85,12 +90,14 @@ def test_upload_download(self):
         # Cleanup folder
         self.dbx.files_delete('/Test/%s' % timestamp)
 
-    def test_team(self):
-        self.dbxt.team_groups_list()
-        r = self.dbxt.team_members_list()
+    @require_team_token
+    def test_team(self, token):
+        dbxt = DropboxTeam(token)
+        dbxt.team_groups_list()
+        r = dbxt.team_members_list()
         if r.members:
             # Only test assuming a member if there is a member
-            self.dbxt.as_user(r.members[0].profile.team_member_id).files_list_folder('')
+            dbxt.as_user(r.members[0].profile.team_member_id).files_list_folder('')
 
 
 from io import BytesIO
