Updated billing tests

Added `bill_type` field to expected.

Used datetime to get current month/year since there is no guarantee
 that we will have historical billing data for the account being used to
 test.

Added bill_type

Author: ricellis

tests/unit/client_tests.py

@@ -26,7 +26,7 @@
 import base64
 import sys
 import os
-from datetime import datetime
+import datetime
 
 from cloudant import cloudant, couchdb, couchdb_admin_party
 from cloudant.client import Cloudant, CouchDB
@@ -471,17 +471,19 @@ def test_billing_data(self):
         """
         try:
             self.client.connect()
+            now = datetime.datetime.now()
             expected = [
                 'data_volume',
                 'total',
                 'start',
                 'end',
                 'http_heavy',
-                'http_light'
+                'http_light',
+                'bill_type'
                 ]
             # Test using year and month
-            year = 2016
-            month = 1
+            year = now.year
+            month = now.month
             data = self.client.bill(year, month)
             self.assertTrue(all(x in expected for x in data.keys()))
             #Test without year and month arguments
@@ -563,15 +565,16 @@ def test_volume_usage_data(self):
         """
         try:
             self.client.connect()
+            now = datetime.datetime.now()
             expected = [
                 'data_vol',
                 'granularity',
                 'start',
                 'end'
                 ]
             # Test using year and month
-            year = 2016
-            month = 12
+            year = now.year
+            month = now.month
             data = self.client.volume_usage(year, month)
             self.assertTrue(all(x in expected for x in data.keys()))
             #Test without year and month arguments
@@ -653,15 +656,16 @@ def test_requests_usage_data(self):
         """
         try:
             self.client.connect()
+            now = datetime.datetime.now()
             expected = [
                 'requests',
                 'granularity',
                 'start',
                 'end'
                 ]
             # Test using year and month
-            year = 2016
-            month = 1
+            year = now.year
+            month = now.month
             data = self.client.requests_usage(year, month)
             self.assertTrue(all(x in expected for x in data.keys()))
             #Test without year and month arguments