Merge pull request #330 from bird-house/issue-329-fix-test-suite-part2

Fix #329: fix test-suite ... pep8 ... test failures

Author: cehbrecht

pywps/app/WPSRequest.py

@@ -631,7 +631,7 @@ def _get_rawvalue_value(data, encoding=None):
         elif encoding == 'base64':
             return base64.b64decode(data)
         return base64.b64decode(data)
-    except:
+    except Exception:
         return data
 
 

pywps/inout/literaltypes.py

@@ -199,7 +199,7 @@ def convert_boolean(inpt):
                 val = False
             else:
                 val = True
-        except:
+        except Exception:
             val = True
     return val
 

pywps/inout/outputs.py

@@ -238,7 +238,7 @@ def _execute_xml_data(self):
             try:
                 data_doc = etree.parse(self.file)
                 complex_doc.append(data_doc.getroot())
-            except:
+            except Exception:
 
                 if isinstance(self.data, six.string_types):
                     complex_doc.text = self.data

pywps/tests.py

@@ -114,6 +114,14 @@ def assert_response_success(resp):
     assert len(success) == 1
 
 
+def assert_process_exception(resp, code=None):
+    assert resp.status_code == 400
+    assert resp.headers['Content-Type'] == 'text/xml'
+    elem = resp.xpath('/ows:ExceptionReport'
+                      '/ows:Exception')
+    assert elem[0].attrib['exceptionCode'] == code
+
+
 def assert_pywps_version(resp):
     # get first child of root element
     root_firstchild = resp.xpath('/*')[0].getprevious()

tests/test_describe.py

@@ -19,6 +19,7 @@
 from pywps.exceptions import MissingParameterValue
 
 from pywps.tests import assert_pywps_version, client_for
+from pywps.tests import assert_process_exception
 
 ProcessDescription = namedtuple('ProcessDescription', ['identifier', 'inputs', 'metadata'])
 
@@ -90,14 +91,15 @@ def test_get_request_all_args(self):
         assert 'hello metadata' in [item for sublist in metadata for item in sublist]
 
     def test_get_request_zero_args(self):
-        with self.assertRaises(MissingParameterValue) as e:
-            resp = self.client.get('?Request=DescribeProcess&version=1.0.0&service=wps')
-            assert resp.status_code == 400  # bad request, identifier is missing
+        # with self.assertRaises(MissingParameterValue) as e:
+        resp = self.client.get('?Request=DescribeProcess&version=1.0.0&service=wps')
+        # bad request, identifier is missing
+        assert_process_exception(resp, code='MissingParameterValue')
 
     def test_get_request_nonexisting_process_args(self):
-        with self.assertRaises(InvalidParameterValue) as e:
-            resp = self.client.get('?Request=DescribeProcess&version=1.0.0&service=wps&identifier=NONEXISTINGPROCESS')
-            assert resp.status_code == 400
+        resp = self.client.get('?Request=DescribeProcess&version=1.0.0&service=wps&identifier=NONEXISTINGPROCESS')
+        # bad request, identifier does not exist
+        assert_process_exception(resp, code='InvalidParameterValue')
 
     def test_post_request_zero_args(self):
         request_doc = WPS.DescribeProcess()

tests/test_wpsrequest.py

@@ -29,7 +29,8 @@ def test_json_in(self):
             'operation': 'getcapabilities',
             'version': '1.0.0',
             'language': 'eng',
-            'identifiers': 'ahoj',
+            'identifier': 'ahoj',
+            'identifiers': 'ahoj',  # TODO: why identifierS?
             'store_execute': True,
             'status': True,
             'lineage': True,
@@ -68,7 +69,8 @@ def test_json_inout_datetime(self):
             'operation': 'getcapabilities',
             'version': '1.0.0',
             'language': 'eng',
-            'identifiers': 'moinmoin',
+            'identifier': 'moinmoin',
+            'identifiers': 'moinmoin',  # TODO: why identifierS?
             'store_execute': True,
             'status': True,
             'lineage': True,