Merge "Remove usage of internal library function in basic generator"
diff --git a/tempest/common/generator/base_generator.py b/tempest/common/generator/base_generator.py
index 7e7a2d6..95d50e2 100644
--- a/tempest/common/generator/base_generator.py
+++ b/tempest/common/generator/base_generator.py
@@ -62,7 +62,7 @@
"admin_client": {"type": "boolean"},
"url": {"type": "string"},
"default_result_code": {"type": "integer"},
- "json-schema": jsonschema._utils.load_schema("draft4"),
+ "json-schema": {},
"resources": {
"type": "array",
"items": {
@@ -105,6 +105,8 @@
self.types_dict[type].append(method)
def validate_schema(self, schema):
+ if "json-schema" in schema:
+ jsonschema.Draft4Validator.check_schema(schema['json-schema'])
jsonschema.validate(schema, self.schema)
def generate(self, schema):
diff --git a/tempest/tests/negative/test_negative_generators.py b/tempest/tests/negative/test_negative_generators.py
new file mode 100644
index 0000000..f2ed999
--- /dev/null
+++ b/tempest/tests/negative/test_negative_generators.py
@@ -0,0 +1,81 @@
+# Copyright 2014 Deutsche Telekom AG
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import jsonschema
+import mock
+
+import tempest.common.generator.base_generator as base_generator
+from tempest.tests import base
+
+
+class TestNegativeBasicGenerator(base.TestCase):
+ valid_desc = {
+ "name": "list-flavors-with-detail",
+ "http-method": "GET",
+ "url": "flavors/detail",
+ "json-schema": {
+ "type": "object",
+ "properties": {
+ "minRam": {"type": "integer"},
+ "minDisk": {"type": "integer"}
+ }
+ },
+ "resources": ["flavor", "volume", "image"]
+ }
+
+ minimal_desc = {
+ "name": "list-flavors-with-detail",
+ "http-method": "GET",
+ "url": "flavors/detail",
+ }
+
+ add_prop_desc = {
+ "name": "list-flavors-with-detail",
+ "http-method": "GET",
+ "url": "flavors/detail",
+ "unknown_field": [12]
+ }
+
+ invalid_json_schema_desc = {
+ "name": "list-flavors-with-detail",
+ "http-method": "GET",
+ "url": "flavors/detail",
+ "json-schema": {"type": "NotExistingType"}
+ }
+
+ def setUp(self):
+ super(TestNegativeBasicGenerator, self).setUp()
+ self.generator = base_generator.BasicGeneratorSet()
+
+ def _assert_valid_jsonschema_call(self, jsonschema_mock, desc):
+ self.assertEqual(jsonschema_mock.call_count, 1)
+ jsonschema_mock.assert_called_with(desc, self.generator.schema)
+
+ @mock.patch('jsonschema.validate', wraps=jsonschema.validate)
+ def test_validate_schema_with_valid_input(self, jsonschema_mock):
+ self.generator.validate_schema(self.valid_desc)
+ self._assert_valid_jsonschema_call(jsonschema_mock, self.valid_desc)
+
+ @mock.patch('jsonschema.validate', wraps=jsonschema.validate)
+ def test_validate_schema_with_minimal_input(self, jsonschema_mock):
+ self.generator.validate_schema(self.minimal_desc)
+ self._assert_valid_jsonschema_call(jsonschema_mock, self.minimal_desc)
+
+ def test_validate_schema_with_invalid_input(self):
+ self.assertRaises(jsonschema.ValidationError,
+ self.generator.validate_schema, self.add_prop_desc)
+ self.assertRaises(jsonschema.SchemaError,
+ self.generator.validate_schema,
+ self.invalid_json_schema_desc)