Running test an py3

Author: abhijo89-uc

.gitignore

@@ -7,6 +7,7 @@ __pycache__/
 
 # docker file to test all pytho3 version
 docker-*
+Dockerfile*
 
 # Distribution / packaging
 .Python

py3resttest/__init__.py

@@ -1,2 +1,2 @@
-#__all__ = ["resttest", "generators", "binding", "parsing",
+# __all__ = ["resttest", "generators", "binding", "parsing",
 #           "validators", "contenthandling", "benchmarks", "tests", "six"]

py3resttest/benchmark_framework_mini.py

@@ -23,11 +23,13 @@
 
 # Time for full curl execution on Django testing rest app
 # Time: 41.4s for 10k runs, or about 4.14 ms per
-timeit.timeit("mycurl=mytest.configure_curl(); mycurl.setopt(pycurl.WRITEFUNCTION, lambda x: None); mycurl.perform(); mycurl.close()",
-              setup='import pycurl; from resttest import Test; input = {"url": "/api/person/", "NAME":"foo", "group":"bar"}; mytest=Test.parse_test("http://localhost:8000", input);',
-              number=10000)
+timeit.timeit(
+    "mycurl=mytest.configure_curl(); mycurl.setopt(pycurl.WRITEFUNCTION, lambda x: None); mycurl.perform(); mycurl.close()",
+    setup='import pycurl; from resttest import Test; input = {"url": "/api/person/", "NAME":"foo", "group":"bar"}; mytest=Test.parse_test("http://localhost:8000", input);',
+    number=10000)
 
 # Github perf test, 27 s for 100 runs = 270 ms per
-timeit.timeit("mycurl=mytest.configure_curl(); mycurl.setopt(pycurl.WRITEFUNCTION, lambda x: None); mycurl.perform(); mycurl.close()",
-              setup='import pycurl; from resttest import Test; input = {"url": "/search/users?q=jewzaam", "NAME":"foo", "group":"bar"}; mytest=Test.parse_test("https://api.github.com", input);',
-              number=100)
+timeit.timeit(
+    "mycurl=mytest.configure_curl(); mycurl.setopt(pycurl.WRITEFUNCTION, lambda x: None); mycurl.perform(); mycurl.close()",
+    setup='import pycurl; from resttest import Test; input = {"url": "/search/users?q=jewzaam", "NAME":"foo", "group":"bar"}; mytest=Test.parse_test("https://api.github.com", input);',
+    number=100)

py3resttest/benchmarks.py

@@ -1,12 +1,11 @@
-import math
 import json
+import math
+
 import pycurl
 
 from py3resttest.constants import DEFAULT_TIMEOUT
-from py3resttest.tests import Test, coerce_to_string
 from py3resttest.parsing import *
-
-
+from py3resttest.testcase import Test, coerce_to_string
 
 """
 Encapsulates logic related to benchmarking
@@ -15,7 +14,6 @@
 - Templating/Caching logic specific to benchmarks
 """
 
-
 # Curl metrics for benchmarking, key is name in config file, value is pycurl variable
 # Taken from pycurl docs, this is libcurl variable minus the CURLINFO prefix
 # Descriptions of the timing variables are taken from libcurl docs:
@@ -51,7 +49,6 @@
     # Total time of the previous request.
     'total_time': pycurl.TOTAL_TIME,
 
-
     # Transfer sizes and speeds
     'size_download': pycurl.SIZE_DOWNLOAD,
     'size_upload': pycurl.SIZE_UPLOAD,
@@ -68,11 +65,11 @@
 # aggregation on an array
 AGGREGATES = {
     'mean_arithmetic':  # AKA the average, good for many things
-    lambda x: float(sum(x)) / float(len(x)),
+        lambda x: float(sum(x)) / float(len(x)),
     'mean':  # Alias for arithmetic mean
-    lambda x: float(sum(x)) / float(len(x)),
+        lambda x: float(sum(x)) / float(len(x)),
     'mean_harmonic':  # Harmonic mean, better predicts average of rates: http://en.wikipedia.org/wiki/Harmonic_mean
-    lambda x: 1.0 / (sum([1.0 / float(y) for y in x]) / float(len(x))),
+        lambda x: 1.0 / (sum([1.0 / float(y) for y in x]) / float(len(x))),
     'median': lambda x: median(x),
     'std_deviation': lambda x: std_deviation(x),
     'sum': lambda x: sum(x),
@@ -99,7 +96,7 @@ def std_deviation(array):
         return 0
 
     average = AGGREGATES['mean_arithmetic'](array)
-    variance = map(lambda x: (x - average)**2, array)
+    variance = map(lambda x: (x - average) ** 2, array)
     variance = list(variance)
     stdev = AGGREGATES['mean_arithmetic'](variance)
     return math.sqrt(stdev)
@@ -234,7 +231,7 @@ def parse_benchmark(base_url, node):
                                     "Invalid aggregate input: non-string aggregate name")
                             # TODO unicode-safe this
                             benchmark.add_metric(coerce_to_string(metricname),
-                                coerce_to_string(aggregate))
+                                                 coerce_to_string(aggregate))
 
                     elif isinstance(metric, str):
                         benchmark.add_metric(coerce_to_string(metric))
@@ -248,7 +245,7 @@ def parse_benchmark(base_url, node):
                         raise TypeError(
                             "Invalid aggregate input: non-string aggregate name")
                     benchmark.add_metric(coerce_to_string(metricname),
-                        coerce_to_string(aggregate))
+                                         coerce_to_string(aggregate))
             else:
                 raise TypeError(
                     "Invalid benchmark metric datatype: " + str(value))

py3resttest/binding.py

@@ -23,7 +23,7 @@ def bind_variable(self, variable_name, variable_value):
         if prev != variable_value:
             self.variables[str(variable_name)] = variable_value
             self.mod_count = self.mod_count + 1
-            #logging.debug('Context: altered variable named {0} to value {1}'.format(str_name, variable_value))
+            # logging.debug('Context: altered variable named {0} to value {1}'.format(str_name, variable_value))
 
     def bind_variables(self, variable_map):
         for key, value in variable_map.items():
@@ -38,7 +38,7 @@ def add_generator(self, generator_name, generator):
                 'Cannot add generator named {0}, it is not a generator type'.format(generator_name))
 
         self.generators[str(generator_name)] = generator
-        #logging.debug('Context: Added generator named {0}'.format(generator_name))
+        # logging.debug('Context: Added generator named {0}'.format(generator_name))
 
     def bind_generator_next(self, variable_name, generator_name):
         """ Binds the next value for generator_name to variable_name and return value used """
@@ -51,7 +51,7 @@ def bind_generator_next(self, variable_name, generator_name):
             self.variables[str_name] = val
             self.mod_count = self.mod_count + 1
             # Logging is /expensive/
-            #logging.debug('Context: Set variable named {0} to next value {1} from generator named {2}'.format(variable_name, val, generator_name))
+            # logging.debug('Context: Set variable named {0} to next value {1} from generator named {2}'.format(variable_name, val, generator_name))
         return val
 
     def get_values(self):

py3resttest/constants.py

@@ -1,6 +1,6 @@
-
 DEFAULT_TIMEOUT = 10
 
+
 class YamlKeyWords:
     IMPORT = 'import'
     TEST = 'test'
@@ -13,4 +13,3 @@ class YamlKeyWords:
     VARS = 'variable_binds'
     GENERATORS = 'generators'
     RETRIES = 'retries'
-

py3resttest/contenthandling.py

@@ -1,6 +1,6 @@
 import os
-from py3resttest.parsing import *
 
+from py3resttest.parsing import *
 
 """
 Encapsulates contend handling logic, for pulling file content into tests

py3resttest/generators.py

@@ -1,7 +1,8 @@
+import logging
+import os
 import random
 import string
-import os
-import logging
+
 from py3resttest.parsing import flatten_dictionaries, lowercase_keys
 
 """ Collection of generators to be used in templating for test data

py3resttest/parsing.py

@@ -14,6 +14,7 @@ def encode_unicode_bytes(my_string):
 
     return my_string
 
+
 # TODO create a full class that extends string.Template
 def safe_substitute_unicode_template(templated_string, variable_map):
     """ Perform string.Template safe_substitute on unicode input with unicode variable values by using escapes
@@ -23,7 +24,6 @@ def safe_substitute_unicode_template(templated_string, variable_map):
     return string.Template(templated_string).safe_substitute(variable_map)
 
 
-
 def safe_to_json(in_obj):
     """ Safely get dict from object if present for json dumping """
     if isinstance(in_obj, bytearray):
@@ -73,7 +73,6 @@ def safe_to_bool(input):
         raise TypeError(
             'Input Object is not a boolean or string form of boolean!')
 
-
 # class SuperConfigurator(object):
 #     """ It's a bird!  It's a plane! No, it's....
 #         The solution to handling horribly nasty, thorny configuration handling methods

py3resttest/resttest.py

@@ -8,25 +8,24 @@
 import time
 import traceback
 from email import message_from_string
+from io import BytesIO
 from optparse import OptionParser
 from urllib.parse import urljoin
 
 import pycurl
 import yaml
 
-from io import BytesIO
-
-from py3resttest.benchmarks import METRICS, AGGREGATES, parse_benchmark
-from py3resttest.constants import YamlKeyWords
-from py3resttest.binding import Context
 from py3resttest import generators
 from py3resttest import validators
+from py3resttest.benchmarks import METRICS, AGGREGATES, parse_benchmark
+from py3resttest.binding import Context
+from py3resttest.constants import DEFAULT_TIMEOUT
+from py3resttest.constants import YamlKeyWords
 from py3resttest.generators import parse_generator
 from py3resttest.parsing import flatten_dictionaries, lowercase_keys, safe_to_bool, safe_to_json
-
+from py3resttest.testcase import Test
 from py3resttest.validators import Failure
-from py3resttest.tests import Test
-from py3resttest.constants import DEFAULT_TIMEOUT
+
 ESCAPE_DECODING = 'unicode_escape'
 
 """
@@ -732,14 +731,17 @@ def register_extensions(modules):
             raise ImportError(
                 "Extension to register did not contain any registries: {0}".format(ext))
 
+
 try:
     import jsonschema
+
     register_extensions('py3resttest.ext.validator_jsonschema')
 except ImportError as ie:
     logging.debug("Failed to load jsonschema validator, make sure the jsonschema "
                   "module is installed if you wish to use schema validators.")
 try:
     import jmespath
+
     register_extensions('py3resttest.ext.extractor_jmespath')
 except ImportError as ie:
     logging.debug("Failed to load jmespath extractor, make sure the jmespath module "

py3resttest/tests.py renamed to py3resttest/testcase.py

@@ -1,14 +1,14 @@
-
 import copy
 import json
+from io import BytesIO as MyIO
+from urllib.parse import urljoin
+
 import pycurl
 
+from py3resttest import validators
 from py3resttest.constants import DEFAULT_TIMEOUT
 from py3resttest.contenthandling import ContentHandler
-from urllib.parse import urljoin
-from py3resttest import validators
 from py3resttest.parsing import *
-from io import BytesIO as MyIO
 
 """
 Pull out the Test objects and logic associated with them
@@ -54,7 +54,6 @@ def coerce_http_method(val: str):
     if not isinstance(val, str) or len(val) == 0:
         raise TypeError("Invalid HTTP method name: input {0} is not a string or has 0 length".format(val))
 
-
     return val.upper()
 
 
@@ -91,6 +90,11 @@ class Test(object):
     generator_binds = None  # Dict of variable name and then generator name
     extract_binds = None  # Dict of variable name and extract function to run
 
+    def __init__(self):
+        self.headers = dict()
+        self.expected_status = [200]
+        self.templated = dict()
+
     @staticmethod
     def has_contains():
         return 'contains' in validators.VALIDATORS
@@ -257,11 +261,6 @@ def realize_partial(self, context=None):
             output._body = newbod
         return output
 
-    def __init__(self):
-        self.headers = dict()
-        self.expected_status = [200]
-        self.templated = dict()
-
     def __str__(self):
         return json.dumps(self, default=safe_to_json)