[med-svn] [python-fitbit] 02/02: fix_tests_for_nose

[Olivier Sallou]

This is an automated email from the git hooks/post-receive script.

osallou pushed a commit to branch patch-queue/master
in repository python-fitbit.

commit 6806db32b796d4bc0580c29fb42574e63161afe3
Author: Olivier Sallou <osallou at debian.org>
Date:   Sat Aug 22 14:02:40 2015 +0000

    fix_tests_for_nose
    
    To make tests ok with nose, we need to adapt a little the way to execute tests.
    mock version may also have an impact and I needed to manage method call with no parameter.
---
 fitbit_tests/__init__.py | 21 ---------------------
 fitbit_tests/test_api.py |  4 +++-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/fitbit_tests/__init__.py b/fitbit_tests/__init__.py
index a507c66..e69de29 100644
--- a/fitbit_tests/__init__.py
+++ b/fitbit_tests/__init__.py
@@ -1,21 +0,0 @@
-import unittest
-from .test_exceptions import ExceptionTest
-from .test_auth import AuthTest
-from .test_api import APITest, CollectionResourceTest, DeleteCollectionResourceTest, MiscTest
-
-
-def all_tests(consumer_key="", consumer_secret="", user_key=None, user_secret=None):
-    kwargs = {
-        "consumer_key": consumer_key,
-        "consumer_secret": consumer_secret,
-        "user_key": user_key,
-        "user_secret": user_secret,
-    }
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ExceptionTest))
-    #suite.addTest(unittest.makeSuite(AuthTest))
-    suite.addTest(unittest.makeSuite(APITest))
-    suite.addTest(unittest.makeSuite(CollectionResourceTest))
-    suite.addTest(unittest.makeSuite(DeleteCollectionResourceTest))
-    suite.addTest(unittest.makeSuite(MiscTest))
-    return suite
diff --git a/fitbit_tests/test_api.py b/fitbit_tests/test_api.py
index bef4aa0..3ec4d51 100644
--- a/fitbit_tests/test_api.py
+++ b/fitbit_tests/test_api.py
@@ -11,7 +11,9 @@ class TestBase(TestCase):
     def setUp(self):
         self.fb = Fitbit('x', 'y')
 
-    def common_api_test(self, funcname, args, kwargs, expected_args, expected_kwargs):
+    def common_api_test(self, funcname=None, args=None, kwargs=None, expected_args=None, expected_kwargs=None):
+        if funcname is None:
+            return
         # Create a fitbit object, call the named function on it with the given
         # arguments and verify that make_request is called with the expected args and kwargs
         with mock.patch.object(self.fb, 'make_request') as make_request:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-fitbit.git