Fix HTTP return code for 404 and 500 returns

Author: rogerdahl

.travis.yml

@@ -41,7 +41,7 @@ script:
   - python ./dev_tools/src/d1_dev/syspath.py
   - pip freeze
   - pip check || true
-  - pytest --help
+  - pytest --version
   # Create GMN template database (must be done in a single threaded run)
   #- pytest --collect-only
   # Run tests in parallel, using as many threads as are supported by Travis

gmn/src/d1_gmn/tests/test_get_log_records.py

@@ -61,7 +61,7 @@ def test_1010(self, gmn_client_v1_v2):
     """getLogRecords(): Slicing: Retrieve front section
     """
     with d1_gmn.tests.gmn_mock.disable_auth():
-      log = gmn_client_v1_v2.getLogRecords(start=0, count=21)
+      log = gmn_client_v1_v2.getLogRecords(start=0, count=3)
       self.norm_entry_id(log)
       self.sample.assert_equals(log, 'front_section', gmn_client_v1_v2)
 
@@ -70,7 +70,7 @@ def test_1020(self, gmn_client_v1_v2):
     """getLogRecords(): Slicing: Retrieve middle section
     """
     with d1_gmn.tests.gmn_mock.disable_auth():
-      log = gmn_client_v1_v2.getLogRecords(start=2000, count=15)
+      log = gmn_client_v1_v2.getLogRecords(start=2000, count=7)
       self.norm_entry_id(log)
       self.sample.assert_equals(log, 'middle_section', gmn_client_v1_v2)
 

lib_common/src/d1_common/wrap/simple_xml.py

@@ -28,11 +28,11 @@
 
 - Process XML that is not DataONE types, and so does not have PyXB bindings.
 
-- Process XML that is invalid in such a day that PyXB cannot parse or generate
+- Process XML that is invalid in such a way that PyXB cannot parse or generate
 it.
 
-- Process XML without causing xs:dateTime fields from being normalized to the
-UTC time zone (PyXB is based on the XML DOM, which requires such normalization).
+- Process XML without causing xs:dateTime fields to be normalized to the UTC
+time zone (PyXB is based on the XML DOM, which requires such normalization.)
 
 - Generate intentionally invalid XML for DataONE types in order to test how MNs,
 CNs and other components of the DataONE architecture handle and recover from
@@ -80,6 +80,7 @@
 import d1_common.types.exceptions
 import d1_common.xml
 
+import xml.etree.ElementTree
 
 @contextlib2.contextmanager
 def wrap(xml_str):
@@ -114,7 +115,7 @@ def get_pretty_xml(self, encoding='unicode'):
 
   def get_xml_below_element(self, el_name, el_idx=0, encoding='unicode'):
     """Return an XML fragment rooted at {el}"""
-    return ET.tostring(self.get_element(el_name, el_idx), encoding)
+    return ET.tostring(self.get_element_by_name(el_name, el_idx), encoding)
 
   def get_element_list_by_name(self, el_name):
     """Return a list of elements with name {el_name}
@@ -128,8 +129,21 @@ def get_element_list_by_attr_key(self, attr_key):
 
   # get element
 
-  def get_element(self, el_name, el_idx=0):
-    """Return the selected element"""
+  def get_element_by_xpath(self, xpath_str, namespaces=None):
+    """Return a list of elements by xpath
+    - A list is always returned, even when there are zero or one matches.
+    """
+    try:
+      return self._root_el.findall('.' + xpath_str, namespaces)
+    except (ValueError, xml.etree.ElementTree.ParseError) as e:
+      raise SimpleXMLWrapperException(
+        'XPath select raised exception. xpath_str="{}" error="{}"'.format(
+          xpath_str, str(e)
+        )
+      )
+
+  def get_element_by_name(self, el_name, el_idx=0):
+    """Return the selected element by element name"""
     el_list = self.get_element_list_by_name(el_name)
     try:
       return el_list[el_idx]
@@ -154,11 +168,11 @@ def get_element_by_attr_key(self, attr_key, el_idx=0):
 
   def get_element_text(self, el_name, el_idx=0):
     """Return the text of the selected element"""
-    return self.get_element(el_name, el_idx).text
+    return self.get_element_by_name(el_name, el_idx).text
 
   def set_element_text(self, el_name, el_text, el_idx=0):
     """Set the text of the selected element"""
-    self.get_element(el_name, el_idx).text = el_text
+    self.get_element_by_name(el_name, el_idx).text = el_text
 
   # set/get text by attr key
 
@@ -192,7 +206,7 @@ def get_element_dt(self, el_name, tz=None, el_idx=0):
     timezone, other contextual information is required in order to determine
     the exact represented time.
     - {tz}=d1_common.date_time.UTC(): Set naive dt to UTC."""
-    return iso8601.parse_date(self.get_element(el_name, el_idx).text, tz)
+    return iso8601.parse_date(self.get_element_by_name(el_name, el_idx).text, tz)
 
   def set_element_dt(self, el_name, dt, tz=None, el_idx=0):
     """Set the text of the selected element to an ISO8601 formatted datetime
@@ -205,13 +219,13 @@ def set_element_dt(self, el_name, dt, tz=None, el_idx=0):
     the exact represented time.
     - {tz}=d1_common.date_time.UTC(): Set naive {dt} to UTC."""
     dt = d1_common.date_time.cast_naive_datetime_to_tz(dt, tz)
-    self.get_element(el_name, el_idx).text = dt.isoformat()
+    self.get_element_by_name(el_name, el_idx).text = dt.isoformat()
 
   # remove
 
   def remove_children(self, el_name, el_idx=0):
     """Remove any child elements from the selected element"""
-    self.get_element(el_name, el_idx)[:] = []
+    self.get_element_by_name(el_name, el_idx)[:] = []
 
   # replace subtree
 
@@ -220,7 +234,7 @@ def replace_by_etree(self, root_el, el_idx=0):
     the selected element with {root_el}
     - {root_el} can be a single element or the root of an element tree.
     """
-    el = self.get_element(root_el.tag, el_idx)
+    el = self.get_element_by_name(root_el.tag, el_idx)
     el[:] = list(root_el)
     el.attrib = root_el.attrib