Resolve conflicts

Author: willson-chen

jsonschema/tests/test_cli.py

@@ -7,6 +7,7 @@
 import os
 import subprocess
 import sys
+import tempfile
 
 from jsonschema import Draft4Validator, Draft7Validator, __version__, cli
 from jsonschema.exceptions import SchemaError, ValidationError
@@ -683,6 +684,32 @@ def test_successful_validation_of_just_the_schema_pretty_output(self):
             stderr="",
         )
 
+    def test_successful_validation_with_specifying_base_uri(self):
+        try:
+            schema_file = tempfile.NamedTemporaryFile(
+                mode='w+',
+                prefix='schema',
+                suffix='.json',
+                dir='..',
+                delete=False
+            )
+            self.addCleanup(os.remove, schema_file.name)
+            schema = """
+                    {"type": "object", "properties": {"KEY1":
+                    {"$ref": %s%s#definitions/schemas"}},
+                    "definitions": {"schemas": {"type": "string"}}}
+                    """ % ("\"", os.path.basename(schema_file.name))
+            schema_file.write(schema)
+        finally:
+            schema_file.close()
+
+        self.assertOutputs(
+            files=dict(some_schema=schema, some_instance='{"KEY1": "1"}'),
+            argv=["-i", "some_instance", "--base-uri", "..", "some_schema"],
+            stdout="",
+            stderr="",
+        )
+
     def test_it_validates_using_the_latest_validator_when_unspecified(self):
         # There isn't a better way now I can think of to ensure that the
         # latest version was used, given that the call to validator_for
@@ -818,4 +845,4 @@ def test_no_arguments_shows_usage_notes(self):
             [sys.executable, "-m", "jsonschema", "--help"],
             stderr=subprocess.STDOUT,
         )
-        self.assertEqual(output, output_for_help)
+        self.assertEqual(output, output_for_help)