[qa] Minor style improvements to changes introduced in 325b511

Author: nemesifier

netjsonconfig/exceptions.py

@@ -1,27 +1,29 @@
 from functools import reduce
 
 
-def list_error_in_subschema(jsonschema_error):
-    sub_errors = []
-    for validator_value, error in zip(jsonschema_error.validator_value, jsonschema_error.context):
-        sub_errors.append((validator_value, error.message))
+def _list_errors(e):
+    """
+    Returns a list of violated schema fragments and related error messages
+    :param e: ``jsonschema.exceptions.ValidationError`` instance
+    """
+    error_list = []
+    for value, error in zip(e.validator_value, e.context):
+        error_list.append((value, error.message))
         if error.context:
-            sub_errors += list_error_in_subschema(error)
-    return sub_errors
+            error_list += _list_errors(error)
+    return error_list
 
 
 class NetJsonConfigException(Exception):
     """
     Root netjsonconfig exception
     """
     def __str__(self):
-        suberrors = list_error_in_subschema(self.details)
-
-        default_message = "%s %s\n" % (self.__class__.__name__, self.details,)
-        suberror_fmt = '\nAgainst schema %s\n%s\n'
-        suberror_message = reduce(lambda x, y: x + suberror_fmt % y, suberrors, '')
-
-        return default_message + suberror_message
+        message = "%s %s\n" % (self.__class__.__name__, self.details,)
+        errors = _list_errors(self.details)
+        separator = '\nAgainst schema %s\n%s\n'
+        details = reduce(lambda x, y: x + separator % y, errors, '')
+        return message + details
 
 
 class ValidationError(NetJsonConfigException):

tests/test_exceptions.py

@@ -0,0 +1,91 @@
+import unittest
+
+from jsonschema import ValidationError, validate
+
+from netjsonconfig import OpenWrt
+from netjsonconfig.exceptions import _list_errors
+
+schema = {
+    '$schema': 'http://json-schema.org/draft-04/schema#',
+    'type': 'object',
+    'additionalProperties': True,
+    'definitions': {
+        'spam_object': {
+            'additionalProperties': True,
+            'required': [
+                'spam',
+            ],
+            'properties': {
+                'spam': {
+                    'type': 'string',
+                },
+            },
+        },
+        'eggs_object': {
+            'additionalProperties': True,
+            'required': [
+                'eggs',
+            ],
+            'properties': {
+                'eggs': {
+                    'type': 'boolean',
+                },
+            },
+        },
+    },
+    'properties': {
+        'test_object': {
+            'type': 'object',
+            'oneOf': [
+                {'$ref': '#/definitions/spam_object'},
+                {'$ref': '#/definitions/eggs_object'},
+            ],
+        }
+    }
+}
+
+
+class TestJsonSchema(unittest.TestCase):
+    """
+    tests ValidationError helpers
+    """
+    def test_spam_object(self):
+        test_i = {'test_object': {'spam': 'lots of'}}
+        validate(test_i, schema)
+
+    def test_eggs_object(self):
+        test_i = {'test_object': {'eggs': True}}
+        validate(test_i, schema)
+
+    def test_burrito_object(self):
+        test_i = {'test_object': {'burrito': 'yes'}}
+        self.assertRaises(ValidationError, validate, test_i, schema)
+
+    def test_burrito_error_message(self):
+        test_i = {'test_object': {'burrito': 'yes'}}
+        with self.assertRaises(ValidationError) as e:
+            validate(test_i, schema)
+        message_list = [
+            "'spam' is a required property",
+            "'eggs' is a required property",
+        ]
+        self.assertEqual([err.message for err in e.exception.context], message_list)
+
+    def test_list_errors(self):
+        test_i = {'test_object': {'burrito': 'yes'}}
+        with self.assertRaises(ValidationError) as e:
+            validate(test_i, schema)
+        suberror_list = [
+            ({'$ref': '#/definitions/spam_object'}, "'spam' is a required property"),
+            ({'$ref': '#/definitions/eggs_object'}, "'eggs' is a required property"),
+        ]
+        self.assertEqual(_list_errors(e.exception), suberror_list)
+
+    def test_error_str(self):
+        o = OpenWrt({'interfaces': [{'wrong': True}]})
+        try:
+            o.validate()
+        except Exception as e:
+            self.assertIn('Against schema', str(e))
+        else:
+            self.fail('ValidationError not raised')