better tests structure

jmg · Jan 24, 2014 · ce09b9e · ce09b9e
1 parent be2bd3e
commit ce09b9e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 dist
 build
 *egg-info
-test_data.json
+test_data.py
diff --git a/run_tests.sh b/run_tests.sh
@@ -0,0 +1 @@
+python tests/test.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -0,0 +1 @@
+python tests/test.py
diff --git a/test.py → tests/test.py b/test.py → tests/test.py
@@ -7,8 +7,7 @@
 from pyfb import Pyfb
 
 try:
-	with open("test_data.json") as f:
-		keys = json.loads(f.read())
+	from test_data import config
 except IOError:
 	print "\nERROR! You must have a test_data.json file providing the facebook app id and the access token."
 	print "\nExample:"
@@ -21,8 +20,8 @@ class PyfbTests(unittest.TestCase):
     pyfb_args = {}
 
     def setUp(self):
-        self.pyfb = Pyfb(keys["FACEBOOK_APP_ID"], **self.pyfb_args)
-        self.pyfb.set_access_token(keys["FACEBOOK_TOKEN"])
+        self.pyfb = Pyfb(config["FACEBOOK_APP_ID"], **self.pyfb_args)
+        self.pyfb.set_access_token(config["FACEBOOK_TOKEN"])
         self.me = self.pyfb.get_myself()
 
     def test_auth(self):