xcp/accessor.py: Fix test_accessor.py for Python3(more updates later)

Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>

Author: bernhardkaindl

tests/test_accessor.py

@@ -3,19 +3,30 @@
 import xcp.accessor
 
 class TestAccessor(unittest.TestCase):
-    def test_http(self):
-        #raise unittest.SkipTest("comment out if you really mean it")
-        a = xcp.accessor.createAccessor("https://updates.xcp-ng.org/netinstall/8.2.1", True)
+    def check_repo_access(self, a):
+        """Common helper function for testing Accessor.access() with repo files"""
         a.start()
         self.assertTrue(a.access('.treeinfo'))
         self.assertFalse(a.access('no_such_file'))
         self.assertEqual(a.lastError, 404)
         a.finish()
 
+    def test_http_accessor_access(self):
+        """Test HTTPAccessor.access()"""
+
+        # Temporary: To be obsoleted by a dedicated test case using a pytest-native
+        # httpd which will cover code paths like HTTP Basic Auth in an upcoming commit:
+        a = xcp.accessor.createAccessor("https://updates.xcp-ng.org/netinstall/8.2.1", True)
+        self.check_repo_access(a)
+
     def test_file(self):
+        """Test FileAccessor.access()"""
+
         a = xcp.accessor.createAccessor("file://tests/data/repo/", True)
-        a.start()
-        self.assertTrue(a.access('.treeinfo'))
-        self.assertFalse(a.access('no_such_file'))
-        self.assertEqual(a.lastError, 404)
-        a.finish()
+        self.check_repo_access(a)
+
+    def test_filesystem_accessor_access(self):
+        """Test FilesystemAccessor.access()"""
+
+        a = xcp.accessor.FilesystemAccessor("tests/data/repo/", True)
+        self.check_repo_access(a)

xcp/accessor.py

@@ -96,7 +96,7 @@ def __init__(self, location, ro):
 
     def openAddress(self, address):
         try:
-            filehandle = open(os.path.join(self.location, address), 'r')
+            filehandle = open(os.path.join(self.location, address), "rb")
         except OSError as e:
             if e.errno == errno.EIO:
                 self.lastError = 5
@@ -217,7 +217,7 @@ def __init__(self, baseAddress, ro):
 
     def openAddress(self, address):
         try:
-            file = open(os.path.join(self.baseAddress, address))
+            file = open(os.path.join(self.baseAddress, address), "rb")
         except IOError as e:
             if e.errno == errno.EIO:
                 self.lastError = 5