Merge pull request #155 from RobertLuptonTheGood/tickets/DM-45921

DM-45921: Protect stat/open call for database load
RobertLuptonTheGood · Aug 22, 2024 · 32ddee3 · 32ddee3
2 parents 8a99e13 + 83bafe8
commit 32ddee3
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 209 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,24 +14,25 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Run CI
       run: |
         ./ci/script.sh
 
   ci-csh:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: Install csh
@@ -43,9 +44,9 @@ jobs:
   ci-macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: Run CI

diff --git a/python/eups/stack/ProductStack.py b/python/eups/stack/ProductStack.py
@@ -702,11 +702,16 @@ def reload(self, flavors=None, persistDir=None, verbose=0):
 
         for flavor in flavors:
             fileName = self._persistPath(flavor,persistDir)
-            self.modtimes[fileName] = os.stat(fileName).st_mtime
-            with open(fileName, "rb") as fd:
-                lookup = pickle.load(fd)
-
-            self.lookup[flavor] = lookup
+            try:
+                self.modtimes[fileName] = os.stat(fileName).st_mtime
+                with open(fileName, "rb") as fd:
+                    lookup = pickle.load(fd)
+            except FileNotFoundError:
+                # Remove the stat call value if that succeeded but the open
+                # failed.
+                self.modtimes.pop(fileName)
+            else:
+                self.lookup[flavor] = lookup
 
     @staticmethod
     def findCachedFlavors(dir):

diff --git a/tests/testAll.py b/tests/testAll.py
@@ -8,19 +8,19 @@
 
 tests = []
 for t in [
-    "testApp",
-    "testCmd",
-    "testDeprecated",
-    "testDb",
-    "testEups",
-    "testMisc",
-    "testProduct",
-    "testStack",
-    "testTable",
-    "testTags",
-    "testEupspkg",
-    "testSetups",
-    "testEupsIntegration",
+    "test_app",
+    "test_cmd",
+    "test_deprecated",
+    "test_db",
+    "test_eups2",
+    "test_misc",
+    "test_product",
+    "test_stack",
+    "test_table",
+    "test_tags",
+    "test_eupspkg",
+    "test_setups",
+    "test_eups_integration",
     ]:
     tests += __import__(t).suite()
 

diff --git a/tests/testApp.py → tests/test_app.py b/tests/testApp.py → tests/test_app.py
diff --git a/tests/testCmd.py → tests/test_cmd.py b/tests/testCmd.py → tests/test_cmd.py
diff --git a/tests/testDb.py → tests/test_db.py b/tests/testDb.py → tests/test_db.py
diff --git a/tests/testDeprecated.py → tests/test_deprecated.py b/tests/testDeprecated.py → tests/test_deprecated.py
diff --git a/tests/test_eups.py b/tests/test_eups.py
diff --git a/tests/testEups.py → tests/test_eups2.py b/tests/testEups.py → tests/test_eups2.py
diff --git a/tests/testEupsIntegration.py → tests/test_eups_integration.py b/tests/testEupsIntegration.py → tests/test_eups_integration.py
diff --git a/tests/testEupspkg.py → tests/test_eupspkg.py b/tests/testEupspkg.py → tests/test_eupspkg.py
diff --git a/tests/testMisc.py → tests/test_misc.py b/tests/testMisc.py → tests/test_misc.py
diff --git a/tests/testProduct.py → tests/test_product.py b/tests/testProduct.py → tests/test_product.py
diff --git a/tests/testSetups.py → tests/test_setups.py b/tests/testSetups.py → tests/test_setups.py
diff --git a/tests/testStack.py → tests/test_stack.py b/tests/testStack.py → tests/test_stack.py
diff --git a/tests/testTable.py → tests/test_table.py b/tests/testTable.py → tests/test_table.py
diff --git a/tests/testTags.py → tests/test_tags.py b/tests/testTags.py → tests/test_tags.py