lint found minor stuff

Author: mahtin

CloudFlare/tests/test_add.py

@@ -12,11 +12,13 @@
 cf = None
 
 def test_cloudflare(debug=False):
+    """ test_cloudflare """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug)
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_app_invalid():
+    """ test_app_invalid """
     """add API commands"""
     cf.add('OPEN', 'invalid')
     try:
@@ -60,4 +62,3 @@ def test_app_invalid_with_dash():
     test_app_invalid()
     test_app_invalid_with_underscore()
     test_app_invalid_with_dash()
-

CloudFlare/tests/test_api_dump.py

@@ -15,13 +15,15 @@
 OPENAPI_URL = "https://github.com/cloudflare/api-schemas/raw/main/openapi.json"
 
 def test_cloudflare(debug=False):
+    """ test_cloudflare """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug)
     assert isinstance(cf, CloudFlare.CloudFlare)
 
-verb_only = re.compile('^[a-zA-Z0-9][a-zA-Z0-9_\-]*[a-zA-Z0-9]$')
+verb_only = re.compile('^[a-zA-Z0-9][-a-zA-Z0-9_]*[a-zA-Z0-9]$')
 
 def check_cmd_syntax(cmd):
+    """ check_cmd_syntax """
     assert '/' == cmd[0]
     for verb in cmd[1:].split('/'):
         if verb[0] == '@':
@@ -35,6 +37,7 @@ def check_cmd_syntax(cmd):
             assert bool(verb_only.match(verb))
 
 def check_method_syntax(method):
+    """ check_method_syntax """
     assert method in ['GET', 'POST', 'PATCH', 'PUT', 'DELETE']
 
 def test_api_list():

CloudFlare/tests/test_certificates.py

@@ -13,6 +13,7 @@
 cf = None
 
 def test_cloudflare(debug=False):
+    """ test_cloudflare """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug)
     assert isinstance(cf, CloudFlare.CloudFlare)
@@ -21,6 +22,7 @@ def test_cloudflare(debug=False):
 zone_id = None
 
 def test_find_zone(domain_name=None):
+    """ test_find_zone """
     global zone_name, zone_id
     # grab a random zone identifier from the first 10 zones
     if domain_name:
@@ -31,7 +33,7 @@ def test_find_zone(domain_name=None):
         zones = cf.zones.get(params=params)
     except CloudFlare.exceptions.CloudFlareAPIError as e:
         print('%s: Error %d=%s' % (domain_name, int(e), str(e)), file=sys.stderr)
-        exit(0)
+        assert False
     assert len(zones) > 0 and len(zones) <= 10
     n = random.randrange(len(zones))
     zone_name = zones[n]['name']
@@ -40,12 +42,13 @@ def test_find_zone(domain_name=None):
     print('zone: %s %s' % (zone_id, zone_name), file=sys.stderr)
 
 def test_certificates():
+    """ test_certificates """
     params = {'zone_id':zone_id}
     try:
         certificates = cf.certificates(params=params)
     except CloudFlare.exceptions.CloudFlareAPIError as e:
         print('%s: Error %d=%s - can not run this test on this domain - no worries - skipping' % (zone_name, int(e), str(e)), file=sys.stderr)
-        exit(0)
+        return
 
     assert isinstance(certificates, list)
     if len(certificates) == 0:

CloudFlare/tests/test_cloudflare.py

@@ -7,74 +7,88 @@
 sys.path.insert(0, os.path.abspath('..'))
 import CloudFlare
 
-global cf
+cf = None
 
 def test_cloudflare(debug=False):
+    """ test_cloudflare """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug)
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_ips1():
+    """ test_ips1 """
     ips = cf.ips()
     assert isinstance(ips, dict)
     assert len(ips) > 0
 
 def test_cloudflare_with_global_request_timeout(debug=False):
+    """ test_cloudflare_with_global_request_timeout """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug, global_request_timeout=10)
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_ips2():
+    """ test_ips2 """
     ips = cf.ips()
     assert isinstance(ips, dict)
     assert len(ips) > 0
 
 def test_cloudflare_with_max_request_retries(debug=False):
+    """ test_cloudflare_with_max_request_retries """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug, max_request_retries=2)
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_ips3():
+    """ test_ips3 """
     ips = cf.ips()
     assert isinstance(ips, dict)
     assert len(ips) > 0
 
 def test_cloudflare_with_global_request_timeout_and_max_request_retries(debug=False):
+    """ test_cloudflare_with_global_request_timeout_and_max_request_retries """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug, global_request_timeout=10, max_request_retries=2)
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_ips4():
+    """ test_ips4 """
     ips = cf.ips()
     assert isinstance(ips, dict)
     assert len(ips) > 0
 
 def test_cloudflare_with_global_request_timeout_invalid(debug=False):
+    """ test_cloudflare_with_global_request_timeout_invalid """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug, global_request_timeout='STRING')
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_ips5():
+    """ test_ips5 """
     ips = cf.ips()
     assert isinstance(ips, dict)
     assert len(ips) > 0
 
 def test_cloudflare_with_max_request_retries_invalid(debug=False):
+    """ test_cloudflare_with_max_request_retries_invalid """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug, max_request_retries='STRING')
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_ips6():
+    """ test_ips6 """
     ips = cf.ips()
     assert isinstance(ips, dict)
     assert len(ips) > 0
 
 def test_cloudflare_with_global_request_timeout_and_max_request_retries_invalid(debug=False):
+    """ test_cloudflare_with_global_request_timeout_and_max_request_retries_invalid """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug, global_request_timeout='STRING', max_request_retries='STRING')
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_ips7():
+    """ test_ips7 """
     ips = cf.ips()
     assert isinstance(ips, dict)
     assert len(ips) > 0
@@ -94,4 +108,3 @@ def test_ips7():
     test_ips6()
     test_cloudflare_with_global_request_timeout_and_max_request_retries_invalid(debug=True)
     test_ips7()
-

CloudFlare/tests/test_dns_import_export.py

@@ -16,6 +16,7 @@
 cf = None
 
 def test_cloudflare():
+    """ test_cloudflare """
     global cf
     cf = CloudFlare.CloudFlare()
     assert isinstance(cf, CloudFlare.CloudFlare)
@@ -24,6 +25,7 @@ def test_cloudflare():
 zone_id = None
 
 def test_find_zone(domain_name=None):
+    """ test_find_zone """
     global zone_name, zone_id
     # grab a random zone identifier from the first 10 zones
     if domain_name:
@@ -34,7 +36,7 @@ def test_find_zone(domain_name=None):
         zones = cf.zones.get(params=params)
     except CloudFlare.exceptions.CloudFlareAPIError as e:
         print('%s: Error %d=%s' % (domain_name, int(e), str(e)), file=sys.stderr)
-        exit(0)
+        assert False
     assert len(zones) > 0 and len(zones) <= 10
     n = random.randrange(len(zones))
     zone_name = zones[n]['name']
@@ -43,6 +45,7 @@ def test_find_zone(domain_name=None):
     print('zone: %s %s' % (zone_id, zone_name), file=sys.stderr)
 
 def test_dns_import():
+    """ test_dns_import """
     # IMPORT
     # create a zero length file
     fp = tempfile.TemporaryFile(mode='w+b')
@@ -62,6 +65,7 @@ def test_dns_import():
     assert results['total_records_parsed'] == 0
 
 def test_dns_export():
+    """ test_dns_export """
     # EXPORT
     dns_records = cf.zones.dns_records.export.get(zone_id)
     assert len(dns_records) > 0
@@ -70,11 +74,13 @@ def test_dns_export():
     assert 'NS' in dns_records
 
 def test_cloudflare_with_debug():
+    """ test_cloudflare_with_debug """
     global cf
     cf = CloudFlare.CloudFlare(debug=True)
     assert isinstance(cf, CloudFlare.CloudFlare)
 
 def test_dns_import_with_debug():
+    """ test_dns_import_with_debug """
     # IMPORT
     # create a zero length file
     fp = tempfile.TemporaryFile(mode='w+b')
@@ -94,6 +100,7 @@ def test_dns_import_with_debug():
     assert results['total_records_parsed'] == 0
 
 def test_dns_export_with_debug():
+    """ test_dns_export_with_debug """
     # EXPORT
     dns_records = cf.zones.dns_records.export.get(zone_id)
     assert len(dns_records) > 0

CloudFlare/tests/test_dns_records.py

@@ -14,6 +14,7 @@
 cf = None
 
 def test_cloudflare(debug=False):
+    """ test_cloudflare """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug)
     assert isinstance(cf, CloudFlare.CloudFlare)
@@ -22,6 +23,7 @@ def test_cloudflare(debug=False):
 zone_id = None
 
 def test_find_zone(domain_name=None):
+    """ test_find_zone """
     global zone_name, zone_id
     # grab a random zone identifier from the first 10 zones
     if domain_name:
@@ -47,6 +49,7 @@ def test_find_zone(domain_name=None):
 dns_content3 = None
 
 def test_dns_records_create_values():
+    """ test_dns_records_create_values """
     global dns_name, dns_type, dns_content1, dns_content2, dns_content3
     dns_name = str(uuid.uuid1())
     dns_type = 'TXT'
@@ -56,6 +59,7 @@ def test_dns_records_create_values():
     print('dns_record: %s' % (dns_name), file=sys.stderr)
 
 def test_dns_records_port_invalid():
+    """ test_dns_records_port_invalid """
     # create an invalid DNS record - i.e. txt value for A record IP address
     dns_record = {'name':dns_name, 'type':'A', 'content':'NOT-A-VALID-IP-ADDRESS'}
     try:
@@ -70,6 +74,7 @@ def test_dns_records_port_invalid():
         assert True
 
 def test_dns_records_get1():
+    """ test_dns_records_get1 """
     # GET
     params = {'name':dns_name + '.' + zone_name, 'match':'all', 'type':dns_type}
     dns_results = cf.zones.dns_records.get(zone_id, params=params)
@@ -78,6 +83,7 @@ def test_dns_records_get1():
 dns_id = None
 
 def test_dns_records_post():
+    """ test_dns_records_post """
     global dns_id
     # POST
     dns_record = {'name':dns_name, 'type':dns_type, 'content':dns_content1}
@@ -91,6 +97,7 @@ def test_dns_records_post():
     print('dns_record: %s %s' % (dns_name, dns_id), file=sys.stderr)
 
 def test_dns_records_get2():
+    """ test_dns_records_get2 """
     # GET
     params = {'name':dns_name + '.' + zone_name, 'match':'all', 'type':dns_type}
     dns_results = cf.zones.dns_records.get(zone_id, params=params)
@@ -100,13 +107,15 @@ def test_dns_records_get2():
     assert dns_results[0]['content'] == dns_content1
 
 def test_dns_records_get3():
+    """ test_dns_records_get3 """
     # GET
     dns_result = cf.zones.dns_records.get(zone_id, dns_id)
     assert dns_result['name'] == dns_name + '.' + zone_name
     assert dns_result['type'] == dns_type
     assert dns_result['content'] == dns_content1
 
 def test_dns_records_patch():
+    """ test_dns_records_patch """
     # PATCH
     dns_record = {'content':dns_content2}
     dns_result = cf.zones.dns_records.patch(zone_id, dns_id, data=dns_record)
@@ -115,6 +124,7 @@ def test_dns_records_patch():
     assert dns_result['content'] == dns_content2
 
 def test_dns_records_put():
+    """ test_dns_records_put """
     # PUT
     dns_record = {'name':dns_name, 'type':dns_type, 'content':dns_content3}
     dns_result = cf.zones.dns_records.put(zone_id, dns_id, data=dns_record)
@@ -123,18 +133,21 @@ def test_dns_records_put():
     assert dns_result['content'] == dns_content3
 
 def test_dns_records_get4():
+    """ test_dns_records_get4 """
     # GET
     dns_result = cf.zones.dns_records.get(zone_id, dns_id)
     assert dns_result['name'] == dns_name + '.' + zone_name
     assert dns_result['type'] == dns_type
     assert dns_result['content'] == dns_content3
 
 def test_dns_records_delete():
+    """ test_dns_records_delete """
     # DELETE
     dns_result = cf.zones.dns_records.delete(zone_id, dns_id)
     assert dns_result['id'] == dns_id
 
 def test_dns_records_get5():
+    """ test_dns_records_get5 """
     # GET
     params = {'name':dns_name + '.' + zone_name, 'match':'all', 'type':dns_type}
     dns_results = cf.zones.dns_records.get(zone_id, params=params)

CloudFlare/tests/test_graphql.py

@@ -17,6 +17,7 @@
 cf = None
 
 def test_cloudflare(debug=False):
+    """ test_cloudflare """
     global cf
     cf = CloudFlare.CloudFlare(debug=debug)
     assert isinstance(cf, CloudFlare.CloudFlare)
@@ -25,6 +26,7 @@ def test_cloudflare(debug=False):
 zone_id = None
 
 def test_find_zone(domain_name=None):
+    """ test_find_zone """
     global zone_name, zone_id
     # grab a random zone identifier from the first 10 zones
     if domain_name:
@@ -35,7 +37,7 @@ def test_find_zone(domain_name=None):
         zones = cf.zones.get(params=params)
     except CloudFlare.exceptions.CloudFlareAPIError as e:
         print('%s: Error %d=%s' % (domain_name, int(e), str(e)), file=sys.stderr)
-        exit(0)
+        assert False
     assert len(zones) > 0 and len(zones) <= 10
     n = random.randrange(len(zones))
     zone_name = zones[n]['name']
@@ -75,14 +77,15 @@ def test_graphql():
     try:
         r = cf.graphql.post(data={'query':query})
     except CloudFlare.exceptions.CloudFlareAPIError as e:
-        exit('/graphql.post %d %s - api call failed' % (e, e))
+        print('%s: Error %d=%s' % ('/graphql.post', int(e), str(e)), file=sys.stderr)
+        assert False
 
     # success - lets confirm it's graphql results as-per query above
 
     # basic graphql results
     assert 'data' in r
     assert 'errors' in r
-    assert r['errors'] == None
+    assert r['errors'] is None
 
     # viewer and zones from above
     assert 'viewer' in r['data']