[accumulo] branch main updated: Fix some minor IT bugs and format JS (#3019)

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 5d14908872 Fix some minor IT bugs and format JS (#3019)
5d14908872 is described below

commit 5d149088725005201bbdb59a4bfc434ee85b04b1
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Oct 12 17:10:47 2022 -0400

    Fix some minor IT bugs and format JS (#3019)
    
    Fix some minor issues from recently merged pull requests
    
    * Fix JavaScript formatting from #2997 (this doesn't always run,
      depending on the contributor's build setup, so this is normal)
    * Fix PropStoreConfigIT from #2967 by checking the correct variable
      names
    * Fix ConditionalWriterIT from #3008 by checking the unused returned
      variable to ensure the timestamp hasn't changed when it's expected
      that a mutation would have failed, rather than have the unused
      variable warning
---
 .../resources/org/apache/accumulo/monitor/resources/js/ec.js  | 11 +++++------
 .../java/org/apache/accumulo/test/ConditionalWriterIT.java    |  3 ++-
 .../java/org/apache/accumulo/test/conf/PropStoreConfigIT.java |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
index 769fa7fd0b..e3883735e8 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
@@ -159,13 +159,12 @@ $(document).ready(function () {
     "paging": false,
     "info": false,
     "columnDefs": [{
-        "targets": "duration",
-        "render": function (data, type, row) {
-          if (type === 'display') data = timeDuration(data);
-          return data;
-        }
+      "targets": "duration",
+      "render": function (data, type, row) {
+        if (type === 'display') data = timeDuration(data);
+        return data;
       }
-    ],
+    }],
     "columns": [{
         "data": "server"
       },
diff --git 
a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java 
b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 18256ffa78..fb0b0f407e 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -350,7 +350,8 @@ public class ConditionalWriterIT extends 
SharedMiniClusterBase {
           assertEquals(Status.REJECTED, cw.write(cm5).getStatus());
 
           // ensure no updates were made
-          var ignored = verifyValues.apply(scanner);
+          var after = verifyValues.apply(scanner);
+          assertEquals(ts, after.getKey().getTimestamp());
 
           // set all columns correctly
           ConditionalMutation cm6 = new ConditionalMutation("99006",
diff --git 
a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java 
b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
index 5ab40399da..9afd650ba3 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
@@ -452,7 +452,7 @@ public class PropStoreConfigIT extends 
AccumuloClusterHarness {
       for (int i = 0; i < iterations; i++) {
 
         Map<String,String> prevProps = null;
-        if (iterations % 10 == 0) {
+        if (i % 10 == 0) {
           prevProps = propShim.getProperties();
         }
 
@@ -483,9 +483,9 @@ public class PropStoreConfigIT extends 
AccumuloClusterHarness {
           // only do >= as opposed to == check. Should at a minimum see the 
changes made by this
           // thread.
           assertTrue(afterA >= beforeA + 2);
-          assertTrue(afterB >= beforeA + 3);
-          assertTrue(afterC >= beforeA + 5);
-          assertTrue(afterD >= beforeA + 7);
+          assertTrue(afterB >= beforeB + 3);
+          assertTrue(afterC >= beforeC + 5);
+          assertTrue(afterD >= beforeD + 7);
         }
       }
       return null;