Browse Source

Merge pull request #10037 from richardkchapman/wutool-test

HPCC-17669 Allow wutool -selftest to be run on a pre-existing dali

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 8 years ago
parent
commit
009939cee8
1 changed files with 2 additions and 1 deletions
  1. 2 1
      tools/wutool/wutool.cpp

+ 2 - 1
tools/wutool/wutool.cpp

@@ -1472,7 +1472,7 @@ protected:
             numIterated++;
         }
         DBGLOG("%d ranged workunits listed the hard way in %d ms", numIterated, msTick()-start);
-        ASSERT_EQUAL(before-1, numIterated); // iterate all except the global workunit
+        ASSERT_EQUAL(before-(isDali?1:0), numIterated); // Dali includes the global workunit in the count, cassandra does not. This filter will not include the global wu
 
         // Check ascending wuids
         WUSortField filterByCluster[] = { WUSFcluster, WUSFterm };
@@ -1761,6 +1761,7 @@ protected:
         Owned<IWUResult> result = global->updateGlobalByName("Result 1");
         result->setResultScalar(true);
         result->setResultInt(53);
+        global->commit();
         result.clear();
         global.clear();