Merge pull request #1107 from ttngu207/exclude_reserved_jobs

exclude "reserved" jobs in `Autopopulate.populate`

Author: ethho

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Fixed - Updated set_password to work on MySQL 8 - PR [#1106](https://github.com/datajoint/datajoint-python/pull/1106)
 - Added - Missing tests for set_password - PR [#1106](https://github.com/datajoint/datajoint-python/pull/1106)
 - Changed - Returning success count after the .populate() call - PR [#1050](https://github.com/datajoint/datajoint-python/pull/1050)
+- Fixed - `Autopopulate.populate` excludes `reserved` jobs in addition to `ignore` and `error` jobs 
 
 ### 0.14.1 -- Jun 02, 2023
 - Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991)

datajoint/autopopulate.py

@@ -207,12 +207,12 @@ def handler(signum, frame):
 
         keys = (self._jobs_to_do(restrictions) - self.target).fetch("KEY", limit=limit)
 
-        # exclude "error" or "ignore" jobs
+        # exclude "error", "ignore" or "reserved" jobs
         if reserve_jobs:
             exclude_key_hashes = (
                 jobs
                 & {"table_name": self.target.table_name}
-                & 'status in ("error", "ignore")'
+                & 'status in ("error", "ignore", "reserved")'
             ).fetch("key_hash")
             keys = [key for key in keys if key_hash(key) not in exclude_key_hashes]
 

tests_old/test_autopopulate.py

@@ -75,17 +75,19 @@ def test_populate_exclude_error_and_ignore_jobs(self):
         assert_true(self.subject, "root tables are empty")
         assert_false(self.experiment, "table already filled?")
 
-        keys = self.experiment.key_source.fetch("KEY", limit=2)
+        keys = self.experiment.key_source.fetch("KEY", limit=3)
         for idx, key in enumerate(keys):
             if idx == 0:
                 schema.schema.jobs.ignore(self.experiment.table_name, key)
-            else:
+            elif idx == 1:
                 schema.schema.jobs.error(self.experiment.table_name, key, "")
+            else:
+                schema.schema.jobs.reserve(self.experiment.table_name, key)
 
         self.experiment.populate(reserve_jobs=True)
         assert_equal(
             len(self.experiment.key_source & self.experiment),
-            len(self.experiment.key_source) - 2,
+            len(self.experiment.key_source) - 3,
         )
 
     def test_allow_direct_insert(self):