Sigh

Author: jpwhite4

classes/DataWarehouse/Query/SUPREMM/SupremmDbInterface.php

@@ -53,10 +53,10 @@ public function updateEtlVersion($resource_id, $new_etl_version) {
 
         $collection = $this->getCollection($resconf['handle'], $resconf['collection']);
 
-        $result = $collection->updateOne(
+        $result = $collection->updateMany(
             array('processed.' . $this->getEtlUid() . '.version' => $this->etl_version),
             array('$set' => array('processed.' . $this->getEtlUid() . '.version' => $new_etl_version)),
-            array('multiple' => true, 'socketTimeoutMS' => -1, 'wTimeoutMS' => -1)
+            array('socketTimeoutMS' => -1, 'wTimeoutMS' => -1)
         );
 
         return $result;

tests/integration/final_tests.sh

@@ -7,7 +7,17 @@ set -e
 
 /usr/lib64/xdmod/xdmod-supremm-admin --action=reset --resource=robertson --force 2>&1 | tee /tmp/supremm-admin-output.txt
 
-if ! grep -q "Job summary documents status reset for 1 jobs" /tmp/supremm-admin-output.txt;
+if ! grep -q "Job summary documents status reset for 6 jobs" /tmp/supremm-admin-output.txt;
 then
     echo "Error missing expected output from xdmod-supremm-admin"
+    exit 1
+fi
+
+# Now run again - this time there will be no jobs to reset
+/usr/lib64/xdmod/xdmod-supremm-admin --action=reset --resource=robertson --force 2>&1 | tee /tmp/supremm-admin-output.txt
+
+if ! grep -q "Job summary documents status reset for 0 jobs" /tmp/supremm-admin-output.txt;
+then
+    echo "Error missing expected output from xdmod-supremm-admin"
+    exit 1
 fi