Tweak the computation of seconds from a datetime.timedelta object, so

that we consider only the whole seconds.

Author: Orest Bolohan

oauth2client/client.py

@@ -634,9 +634,9 @@ def _expires_in(self):
       now = datetime.datetime.utcnow()
       if self.token_expiry > now:
         time_delta = self.token_expiry - now
-        return int(round(time_delta.days * 86400.0 +
-                         time_delta.seconds +
-                         time_delta.microseconds * 0.000001))
+        # TODO(orestica): return time_delta.total_seconds()
+        # once dropping support for Python 2.6
+        return time_delta.days * 86400 + time_delta.seconds
       else:
         return 0
 

tests/test_oauth2client.py

@@ -583,31 +583,32 @@ def test_no_unicode_in_request_params(self):
     self.assertEqual('foobar', instance.token_response)
 
   def test_get_access_token(self):
-    token_response_first = {'access_token': 'first_token', 'expires_in': 1}
-    token_response_second = {'access_token': 'second_token', 'expires_in': 1}
+    S = 2  # number of seconds in which the token expires
+    token_response_first = {'access_token': 'first_token', 'expires_in': S}
+    token_response_second = {'access_token': 'second_token', 'expires_in': S}
     http = HttpMockSequence([
         ({'status': '200'}, simplejson.dumps(token_response_first)),
         ({'status': '200'}, simplejson.dumps(token_response_second)),
     ])
 
     token = self.credentials.get_access_token(http=http)
     self.assertEqual('first_token', token.access_token)
-    self.assertEqual(1, token.expires_in)
+    self.assertEqual(S - 1, token.expires_in)
     self.assertFalse(self.credentials.access_token_expired)
     self.assertEqual(token_response_first, self.credentials.token_response)
 
     token = self.credentials.get_access_token(http=http)
     self.assertEqual('first_token', token.access_token)
-    self.assertEqual(1, token.expires_in)
+    self.assertEqual(S - 1, token.expires_in)
     self.assertFalse(self.credentials.access_token_expired)
     self.assertEqual(token_response_first, self.credentials.token_response)
 
-    time.sleep(1)
+    time.sleep(S)
     self.assertTrue(self.credentials.access_token_expired)
 
     token = self.credentials.get_access_token(http=http)
     self.assertEqual('second_token', token.access_token)
-    self.assertEqual(1, token.expires_in)
+    self.assertEqual(S - 1, token.expires_in)
     self.assertFalse(self.credentials.access_token_expired)
     self.assertEqual(token_response_second, self.credentials.token_response)
 

tests/test_service_account.py

@@ -94,30 +94,31 @@ def test_create_scoped(self):
     self.assertEqual('dummy_scope', new_credentials._scopes)
 
   def test_access_token(self):
-    token_response_first = {'access_token': 'first_token', 'expires_in': 1}
-    token_response_second = {'access_token': 'second_token', 'expires_in': 1}
+    S = 2  # number of seconds in which the token expires
+    token_response_first = {'access_token': 'first_token', 'expires_in': S}
+    token_response_second = {'access_token': 'second_token', 'expires_in': S}
     http = HttpMockSequence([
         ({'status': '200'}, simplejson.dumps(token_response_first)),
         ({'status': '200'}, simplejson.dumps(token_response_second)),
     ])
 
     token = self.credentials.get_access_token(http=http)
     self.assertEqual('first_token', token.access_token)
-    self.assertEqual(1, token.expires_in)  
+    self.assertEqual(S - 1, token.expires_in)  
     self.assertFalse(self.credentials.access_token_expired)
     self.assertEqual(token_response_first, self.credentials.token_response)
 
     token = self.credentials.get_access_token(http=http)
     self.assertEqual('first_token', token.access_token)
-    self.assertEqual(1, token.expires_in)
+    self.assertEqual(S - 1, token.expires_in)
     self.assertFalse(self.credentials.access_token_expired)
     self.assertEqual(token_response_first, self.credentials.token_response)
 
-    time.sleep(1)
+    time.sleep(S)
     self.assertTrue(self.credentials.access_token_expired)
 
     token = self.credentials.get_access_token(http=http)
     self.assertEqual('second_token', token.access_token)
-    self.assertEqual(1, token.expires_in)
+    self.assertEqual(S - 1, token.expires_in)
     self.assertFalse(self.credentials.access_token_expired)
     self.assertEqual(token_response_second, self.credentials.token_response)