Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files

(1) Re-structure tests to do one "extend" action at a time
(2) Re-try test till max limit before final failure

1 files changed, 3 insertions, 63 deletions

diff --git a/hl/tools/testfiles/w-ext-cmpd-two.ddl b/hl/tools/testfiles/w-ext-cmpd-two.ddl
index a461226..57ffc2c 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-two.ddl
@@ -1,67 +1,7 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD_TWO...
 dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
+dimension 1: 10->1 (decreases)
     Data:
-        (0,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (0,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (1,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (1,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (2,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (2,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (3,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (3,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (4,0) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,1) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,2) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,3) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,4) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,5) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,6) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,7) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,8) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,9) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,0) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,1) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,2) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,3) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,4) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,5) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,6) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,7) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,8) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,9) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}},
-        (7,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {3, {3, {3, 3, 3}, 3}, 3, {3, 3}},
-        (9,0) {3, {3, {3, 3, 3}, 3}, 3, {3, 3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}},
-        (0,2) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}}
-        (1,1) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}},
-        (1,2) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}}
-        (2,1) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}},
-        (2,2) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {7, {7, {7, 7, 7}, 7}, 7, {7, 7}},
-        (0,3) {7, {7, {7, 7, 7}, 7}, 7, {7, 7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+        (4,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}},
+        (5,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}}