Merge branch 'master' of github.com:sissaschool/xmlschema

.travis.yml

@@ -20,6 +20,24 @@ matrix:
         - pip3 install --upgrade pip
       install: pip3 install -r requirements-dev.txt
       script: python3 tests/test_all.py
+    - name: "Python 3.7.7 on macOS 10.14.6"
+      os: osx
+      osx_image: xcode11.3
+      language: shell
+      before_install:
+        - python3 --version
+        - pip3 install --upgrade pip
+      install: pip3 install -r requirements-dev.txt
+      script: python3 tests/test_all.py
+    - name: "Python 3.7.7 on macOS 10.15.4"
+      os: osx
+      osx_image: xcode11.4
+      language: shell
+      before_install:
+        - python3 --version
+        - pip3 install --upgrade pip
+      install: pip3 install -r requirements-dev.txt
+      script: python3 tests/test_all.py
     - name: "Python 3.7.4 on Windows"
       os: windows
       language: shell

tests/test_cli.py

@@ -15,6 +15,7 @@
 import io
 import pathlib
 import os
+import platform
 import sys
 
 from xmlschema.cli import validate, xml2json, json2xml
@@ -77,19 +78,24 @@ def test_validate_command_03(self, mock_out, mock_err):
     def test_validate_command_04(self, mock_out, mock_err):
         self.run_validate('unknown.xml')
         self.assertEqual(mock_err.getvalue(), '')
-        self.assertIn("No such file or directory", mock_out.getvalue())
+        output = mock_out.getvalue()
+        if platform.system() == 'Windows':
+            self.assertIn("The system cannot find the file specified", output)
+        else:
+            self.assertIn("No such file or directory", output)
         self.assertEqual('1', str(self.ctx.exception))
 
     @patch('sys.stderr', new_callable=io.StringIO)
     @patch('sys.stdout', new_callable=io.StringIO)
     def test_validate_command_05(self, mock_out, mock_err):
         self.run_validate(*glob.glob('vehicles*.xml'))
         self.assertEqual(mock_err.getvalue(), '')
-        self.assertEqual("vehicles.xml is valid\n"
-                         "vehicles-3_errors.xml is not valid\n"
-                         "vehicles-1_error.xml is not valid\n"
-                         "vehicles2.xml is valid\n"
-                         "vehicles-2_errors.xml is not valid\n", mock_out.getvalue())
+        output = mock_out.getvalue()
+        self.assertIn("vehicles.xml is valid", output)
+        self.assertIn("vehicles-3_errors.xml is not valid", output)
+        self.assertIn("vehicles-1_error.xml is not valid", output)
+        self.assertIn("vehicles2.xml is valid", output)
+        self.assertIn("vehicles-2_errors.xml is not valid", output)
         self.assertEqual('6', str(self.ctx.exception))
 
     @patch('sys.stderr', new_callable=io.StringIO)

tests/test_resources.py

@@ -416,7 +416,7 @@ def test_xml_resource_access(self):
 
         with self.assertRaises(XMLSchemaResourceError) as ctx:
             XMLResource("/tmp/vehicles.xsd", base_url=base_url, allow='sandbox')
-        self.assertEqual(str(ctx.exception),
+        self.assertEqual(str(ctx.exception).replace('\\', '/'),
                          "block access to out of sandbox file /tmp/vehicles.xsd")
 
         with self.assertRaises(TypeError) as ctx: