From ee8be126f940fa037d3a6229cb4ec0b74f9dc7b7 Mon Sep 17 00:00:00 2001 From: Peichao Zhang Date: Fri, 22 Jun 2018 16:26:50 -0700 Subject: [PATCH 1/2] Separated tests for business endpoints to a new class. --- test/test_dropbox.py | 51 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/test/test_dropbox.py b/test/test_dropbox.py index 7d85c376..2929698f 100644 --- a/test/test_dropbox.py +++ b/test/test_dropbox.py @@ -135,37 +135,12 @@ def test_bad_upload_types(self, dbx): with self.assertRaises(TypeError): dbx.files_upload(BytesIO(b'test'), '/Test') - @dbx_team_from_env - def test_team(self, dbxt): - dbxt.team_groups_list() - r = dbxt.team_members_list() - if r.members: - # Only test assuming a member if there is a member - team_member_id = r.members[0].profile.team_member_id - dbxt.as_user(team_member_id).files_list_folder('') - - @dbx_team_from_env - def test_as_user(self, dbxt): - dbx_as_user = dbxt.as_user('1') - self.assertIsInstance(dbx_as_user, Dropbox) - - @dbx_team_from_env - def test_as_admin(self, dbxt): - dbx_as_admin = dbxt.as_admin('1') - self.assertIsInstance(dbx_as_admin, Dropbox) - @dbx_from_env def test_clone_when_user_linked(self, dbx): new_dbx = dbx.clone() self.assertIsNot(dbx, new_dbx) self.assertIsInstance(new_dbx, dbx.__class__) - @dbx_team_from_env - def test_clone_when_team_linked(self, dbxt): - new_dbxt = dbxt.clone() - self.assertIsNot(dbxt, new_dbxt) - self.assertIsInstance(new_dbxt, dbxt.__class__) - @dbx_from_env def test_with_path_root_constructor(self, dbx): # Verify valid mode types @@ -215,5 +190,31 @@ def test_path_root_err(self, dbx): dbxpr.files_list_folder('') self.assertTrue(cm.exception.error.is_invalid_root()) +class TestDropboxTeam(unittest.TestCase): + @dbx_team_from_env + def test_team(self, dbxt): + dbxt.team_groups_list() + r = dbxt.team_members_list() + if r.members: + # Only test assuming a member if there is a member + team_member_id = r.members[0].profile.team_member_id + dbxt.as_user(team_member_id).files_list_folder('') + + @dbx_team_from_env + def test_as_user(self, dbxt): + dbx_as_user = dbxt.as_user('1') + self.assertIsInstance(dbx_as_user, Dropbox) + + @dbx_team_from_env + def test_as_admin(self, dbxt): + dbx_as_admin = dbxt.as_admin('1') + self.assertIsInstance(dbx_as_admin, Dropbox) + + @dbx_team_from_env + def test_clone_when_team_linked(self, dbxt): + new_dbxt = dbxt.clone() + self.assertIsNot(dbxt, new_dbxt) + self.assertIsInstance(new_dbxt, dbxt.__class__) + if __name__ == '__main__': unittest.main() From dc6dc68d287a1ff1cfe93ebf25ec6b655b03c245 Mon Sep 17 00:00:00 2001 From: Peichao Zhang Date: Fri, 22 Jun 2018 16:27:04 -0700 Subject: [PATCH 2/2] Fixed bugs in tests. --- test/test_dropbox.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_dropbox.py b/test/test_dropbox.py index 2929698f..9a409463 100644 --- a/test/test_dropbox.py +++ b/test/test_dropbox.py @@ -76,6 +76,7 @@ def test_default_oauth2_urls(self): 'http://localhost/dummy', 'dummy_session', 'dbx-auth-csrf-token') six.assertRegex( + self, flow_obj._get_authorize_url('http://localhost/redirect', 'state'), r'^https://{}/oauth2/authorize\?'.format(re.escape(session.WEB_HOST)), )