Merge pull request #72 from xenserver-next/accessor-pylint-remains

tests/test_accessor.py: Test File* and HTTPAccessor.openAddress(), fix pylint

Author: bernhardkaindl

tests/test_accessor.py

@@ -3,9 +3,20 @@
 import xcp.accessor
 
 class TestAccessor(unittest.TestCase):
+    def setUp(self):
+        """Provide the refrence content of the repo/.treeinfo file for check_repo_access()"""
+        with open("tests/data/repo/.treeinfo", "rb") as dot_treeinfo:
+            self.reference_treeinfo = dot_treeinfo.read()
+
     def check_repo_access(self, a):
         """Common helper function for testing Accessor.access() with repo files"""
         a.start()
+
+        treeinfo_file = a.openAddress('.treeinfo')
+        assert not isinstance(treeinfo_file, bool)  # check to not return False, pytype alerts on it
+        assert treeinfo_file.read() == self.reference_treeinfo
+        treeinfo_file.close()
+
         self.assertTrue(a.access('.treeinfo'))
         self.assertFalse(a.access('no_such_file'))
         self.assertEqual(a.lastError, 404)

xcp/accessor.py

@@ -216,7 +216,7 @@ def __init__(self, baseAddress, ro):
 
     def openAddress(self, address):
         try:
-            file = open(os.path.join(self.baseAddress, address), "rb")
+            reader = open(os.path.join(self.baseAddress, address), "rb")
         except (IOError, OSError) as e:
             if e.errno == errno.EIO:
                 self.lastError = 5
@@ -226,7 +226,7 @@ def openAddress(self, address):
         except Exception as e:
             self.lastError = 500
             return False
-        return file
+        return reader
 
     def writeFile(self, in_fh, out_name):
         logger.info("Copying to %s" % os.path.join(self.baseAddress, out_name))
@@ -293,7 +293,7 @@ def finish(self):
             self.cleanup = False
             self.ftp = None
 
-    def access(self, path):
+    def access(self, path):  # pylint: disable=arguments-differ,arguments-renamed
         try:
             logger.debug("Testing "+path)
             self._cleanup()
@@ -377,7 +377,7 @@ def __repr__(self):
                        'ftp': FTPAccessor,
                        'file': FileAccessor,
                        'dev': DeviceAccessor,
-                       }
+                      }
 
 def createAccessor(baseAddress, *args):
     url_parts = urllib.parse.urlsplit(baseAddress, allow_fragments=False)