resolve some duplications

.travis.yml

@@ -22,4 +22,4 @@ addons:
 script:
 - python fuzzer.py -h
 - pip3 install -r test/requirements_for_test.txt
-- cd test && pytest --durations=10 --show-capture=stdout -v -rP test.pyy
+- cd test && pytest --durations=10 --show-capture=stdout -v -rP test.py

apifuzzer/base_template.py

@@ -14,6 +14,13 @@ def __init__(self, name):
         self.headers = list()
         self.path_variables = list()
         self.cookies = list()
+        self.field_to_param = {
+            'params': self.params,
+            'headers':self.headers,
+            'data': self.data,
+            'path_variables': self.path_variables,
+            'cookies': self.cookies
+        }
         """
         Possible paramters from request docs:
         :param method: method for the new :class:`Request` object.
@@ -31,14 +38,7 @@ def compile_template(self):
         _method = Static(name='method', value=self.method)
         # _method = Static(name='method', value=self.method, encoder=ENC_STR_UTF8)
         template = Template(name=self.name, fields=[_url, _method])
-        if list(self.params):
-            template.append_fields([Container(name='params', fields=self.params)])
-        if list(self.headers):
-            template.append_fields([Container(name='headers', fields=self.headers)])
-        if list(self.data):
-            template.append_fields([Container(name='data', fields=self.data)])
-        if list(self.path_variables):
-            template.append_fields([Container(name='path_variables', fields=self.path_variables)])
-        if list(self.cookies):
-            template.append_fields([Container(name='cookies', fields=self.cookies)])
+        for name, field in self.field_to_param.items():
+            if list(field):
+                template.append_fields([Container(name=name, fields=field)])
         return template

apifuzzer/fuzzer_target.py

@@ -56,6 +56,11 @@ def compile_headers(self, fuzz_header=None):
             _header.update(self.auth_headers)
         return _header
 
+    def report_add_basic_msg(self, msg):
+        self.report.set_status(Report.FAILED)
+        self.logger.warn(msg)
+        self.report.failed(msg)
+
     def transmit(self, **kwargs):
         self.logger.debug('Transmit: {}'.format(kwargs))
         try:
@@ -102,19 +107,13 @@ def transmit(self, **kwargs):
             self.report.add('response', _return.content.decode())
             status_code = _return.status_code
             if not status_code:
-                self.report.set_status(Report.FAILED)
-                self.logger.warn('Failed to parse http response code')
-                self.report.failed('Failed to parse http response code')
+                self.report_add_basic_msg('Failed to parse http response code')
             elif status_code not in self.accepted_status_codes:
                 self.report.add('parsed_status_code', status_code)
-                self.report.set_status(Report.FAILED)
-                self.logger.warn('Return code %s is not in the expected list', status_code)
-                self.report.failed(('Return code %s is not in the expected list', status_code))
+                self.report_add_basic_msg(('Return code %s is not in the expected list:', status_code))
             return _return
         except (RequestException, UnicodeDecodeError, UnicodeEncodeError) as e:  # request failure such as InvalidHeader
-            self.report.set_status(Report.FAILED)
-            self.logger.warn('Failed to parse http response code, exception occurred')
-            self.report.failed('Failed to parse http response code, exception occurred')
+            self.report_add_basic_msg(('Failed to parse http response code, exception occurred: %s', e))
 
     def post_test(self, test_num):
         """Called after a test is completed, perform cleanup etc."""