Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

tests/support.py

@@ -38,6 +38,7 @@
 from unittest import TestCase, main as testmain
 
 TEST_BASE = os.path.dirname(__file__)
+TEST_DATA_DIR = os.path.join(TEST_BASE, "data")
 TEST_OUTPUT_DIR = os.path.join(TEST_BASE, "output")
 MIG_BASE = os.path.realpath(os.path.join(TEST_BASE, ".."))
 PY2 = sys.version_info[0] == 2
@@ -193,6 +194,8 @@ def logger(self):
             self._logger = FakeLogger()
         return self._logger
 
+    # custom assertions available for common use
+
     def assertPathExists(self, relative_path):
         assert not os.path.isabs(
             relative_path), "expected relative path within output folder"
@@ -203,6 +206,13 @@ def assertPathExists(self, relative_path):
         else:
             return "file"
 
+    @staticmethod
+    def pretty_display_path(absolute_path):
+        assert os.path.isabs(absolute_path)
+        relative_path = os.path.relpath(absolute_path, start=MIG_BASE)
+        assert not relative_path.startswith('..')
+        return relative_path
+
 
 def cleanpath(relative_path, test_case):
     assert isinstance(test_case, MigTestCase)
@@ -211,6 +221,12 @@ def cleanpath(relative_path, test_case):
     return tmp_path
 
 
+def fixturepath(relative_path):
+    tmp_path = os.path.join(TEST_DATA_DIR, relative_path)
+    assert (not stat.S_ISDIR(os.stat(tmp_path)))
+    return tmp_path
+
+
 def temppath(relative_path, test_case, skip_clean=False):
     assert isinstance(test_case, MigTestCase)
     tmp_path = os.path.join(TEST_OUTPUT_DIR, relative_path)

tests/test_mig_shared_fileio.py

@@ -19,9 +19,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
 #
-# -- END_HEADER ---
+# --- END_HEADER ---
 #
 
 """Unit test fileio functions"""

tests/test_mig_shared_localfile.py

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+#
+# --- BEGIN_HEADER ---
+#
+# test_mig_shared_localfile - unit test of the corresponding mig shared module
+# Copyright (C) 2003-2024  The MiG Project by the Science HPC Center at UCPH
+#
+# This file is part of MiG.
+#
+# MiG is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# MiG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+#
+# --- END_HEADER ---
+#
+
+"""Unit tests for the migrid module pointed to in the filename"""
+
+import binascii
+from contextlib import contextmanager
+import errno
+import fcntl
+import os
+import sys
+import zipfile
+
+sys.path.append(os.path.realpath(os.path.join(os.path.dirname(__file__), ".")))
+
+from support import MigTestCase, fixturepath, temppath, testmain
+from mig.shared.serverfile import LOCK_EX
+from mig.shared.localfile import LocalFile
+
+DUMMY_FILE = 'some_file'
+
+
+@contextmanager
+def managed_localfile(lfd):
+    """Helper to assure localfiles are properly handled"""
+
+    assert isinstance(lfd, LocalFile)
+    try:
+        yield lfd
+    finally:
+        if lfd.get_lock_mode() != fcntl.LOCK_UN:
+            pass
+        if not lfd.closed:
+            lfd.close()
+
+
+class MigSharedLocalfile(MigTestCase):
+    """Wrap unit tests for the corresponding module"""
+
+    def assertPathLockedExclusive(self, file_path):
+        """Custom assertion to check whether a file is exclusively locked"""
+
+        with open(file_path) as conflicting_f:
+            reraise = None
+            try:
+                fcntl.flock(
+                    conflicting_f, fcntl.LOCK_NB | LOCK_EX)
+
+                # we were errantly able to acquire a lock, mark errored
+                reraise = AssertionError("RERAISE_MUST_UNLOCK")
+            except Exception as maybeerr:
+                if getattr(maybeerr, 'errno', None) == errno.EAGAIN:
+                    # this is the expected exception - the logic tried to lock
+                    # a file that was (as we intended) already locked, meaning
+                    # this assertion has succeeded so we do not need to raise
+                    pass
+                else:
+                    # some other error we did not expect occurred, record it
+                    reraise = AssertionError("RERAISE_NO_UNLOCK")
+
+            if reraise is not None:
+                # if marked errored and locked, cleanup the lock we acquired but shouldn't
+                if str(reraise) == 'RERAISE_MUST_UNLOCK':
+                    fcntl.flock(conflicting_f, fcntl.LOCK_NB | fcntl.LOCK_UN)
+
+                # raise a user-friendly error to aovid nested raise
+                raise AssertionError(
+                    "expected locked file: %s" % self.pretty_display_path(file_path))
+
+    def test_localfile_locking(self):
+        some_file = temppath(DUMMY_FILE, self)
+
+        with managed_localfile(LocalFile(some_file, 'w')) as lfd:
+            lfd.lock(LOCK_EX)
+
+            self.assertEqual(lfd.get_lock_mode(), LOCK_EX)
+
+            self.assertPathLockedExclusive(some_file)
+
+
+if __name__ == '__main__':
+    testmain()

tests/test_mig_shared_serial.py

@@ -1,4 +1,31 @@
 # -*- coding: utf-8 -*-
+#
+# --- BEGIN_HEADER ---
+#
+# test_mig_shared_serial - unit test of the corresponding mig shared module
+# Copyright (C) 2003-2024  The MiG Project by the Science HPC Center at UCPH
+#
+# This file is part of MiG.
+#
+# MiG is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# MiG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+#
+# --- END_HEADER ---
+#
+
+"""Unit test serial functions"""
 
 import os
 import sys