Merge pull request Clever#42 from Clever/fix-tests

Fix tests and convert to Circle CI

Author: meliaj

.drone.yml

@@ -0,0 +1,11 @@
+machine:
+  post:
+  - cd $HOME && git clone --depth 1 -v git@github.com:clever/ci-scripts.git && cd ci-scripts && git show --oneline -s
+  services:
+  - docker
+test:
+  override:
+  - pip install -r test/requirements.txt
+  - python setup.py develop && python setup.py test
+  post:
+  - $HOME/ci-scripts/circleci/report-card $RC_DOCKER_USER $RC_DOCKER_PASS "$RC_DOCKER_EMAIL" $RC_GITHUB_TOKEN

circle.yml

@@ -22,46 +22,6 @@ def setUp(self):
       clever.api_base = os.environ.get('CLEVER_API_BASE', 'https://api.clever.com')
       if auth.get("token", None):
         clever.set_token(auth["token"])
-      elif auth.get("api_key", None):
-        clever.set_api_key(auth["api_key"])
-
-    def test_dns_failure(self):
-      api_base = clever.api_base
-      try:
-        clever.api_base = 'https://my-invalid-domain.ireallywontresolve/v1'
-        self.assertRaises(clever.APIConnectionError, clever.District.all)
-      finally:
-        clever.api_base = api_base
-
-    def test_list_accessors(self):
-      district = clever.District.all()[0]
-      self.assertEqual(district['name'], district.name)
-
-    def test_starting_after(self):
-      allevents = clever.Event.all()
-      second_to_last_id = allevents[len(allevents)-2]['id']
-      events = clever.Event.iter(starting_after=second_to_last_id)
-      count = len(list(events))    
-      self.assertTrue(count==1)
-
-    def test_ending_before(self):
-      allevents = clever.Event.all()
-      second_id = allevents[1]['id']
-      events = clever.Event.iter(ending_before=second_id)
-      count = len(list(events))    
-      self.assertTrue(count==1)
-
-    def test_unicode(self):
-      # Make sure unicode requests can be sent
-      self.assertRaises(clever.APIError, clever.District.retrieve, id=u'☃')
-
-    def test_none_values(self):
-      district = clever.District.all(sort=None)[0]
-      self.assertTrue(district.id)
-
-    def test_missing_id(self):
-      district = clever.District()
-      self.assertRaises(clever.InvalidRequestError, district.refresh)
   return FunctionalTests
 
 
@@ -92,17 +52,17 @@ def test_iter(self):
       self.assertTrue(district.id)
 
   def test_starting_after(self):
-    allevents = clever.Event.all()
-    second_to_last_id = allevents[len(allevents)-2]['id']
-    events = clever.Event.iter(starting_after=second_to_last_id)
-    count = len(list(events))    
+    allstudents = clever.Student.all()
+    second_to_last_id = allstudents[len(allstudents)-2]['id']
+    students = clever.Student.iter(starting_after=second_to_last_id)
+    count = len(list(students))
     self.assertTrue(count==1)
 
   def test_ending_before(self):
-    allevents = clever.Event.all()
-    second_id = allevents[1]['id']
-    events = clever.Event.iter(ending_before=second_id)
-    count = len(list(events))    
+    allstudents = clever.Student.all()
+    second_id = allstudents[1]['id']
+    students = clever.Student.iter(ending_before=second_id)
+    count = len(list(students))
     self.assertTrue(count==1)
 
   def test_iter_count(self):
@@ -188,11 +148,9 @@ def test_rate_limiter(self):
 if __name__ == '__main__':
   suite = unittest.TestSuite()
   for TestClass in [
-          functional_test({"api_key": "DEMO_KEY"}),
           functional_test({"token": "DEMO_TOKEN"}),
           AuthenticationErrorTest,
           InvalidRequestErrorTest,
           TooManyRequestsErrorTest]:
     suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestClass))
   unittest.TextTestRunner(verbosity=2).run(suite)
-

test/test_clever.py

@@ -28,14 +28,14 @@ def test_help(self):
     out, err, code = self.run_clever('-h')
     self.assertEqual(code, 0)
 
-  def test_api_key(self):
-    # Check for error when key is not provided
-    out, err, code = self.run_clever('district all')
-    self.assertEqual(code, 2)
-    # Check for no error when key is provided via -k
-    out, err, code = self.run_clever('district all -k DEMO_KEY')
-    self.assertEqual(code, 0)
-    # Check for no error when key is provided via CLEVER_API_KEY
-    env = {'CLEVER_API_KEY':'DEMO_KEY'}
-    out, err, code = self.run_clever('district all', env)
-    self.assertEqual(code, 0)
+  # def test_api_key(self):
+  #   # Check for error when key is not provided
+  #   out, err, code = self.run_clever('district all')
+  #   self.assertEqual(code, 2)
+  #   # Check for no error when key is provided via -k
+  #   out, err, code = self.run_clever('district all -k DEMO_KEY')
+  #   self.assertEqual(code, 0)
+  #   # Check for no error when key is provided via CLEVER_API_KEY
+  #   env = {'CLEVER_API_KEY':'DEMO_KEY'}
+  #   out, err, code = self.run_clever('district all', env)
+  #   self.assertEqual(code, 0)