[accumulo] branch 2.1 updated: Use property in test that still exists in main

[ctubbsii]

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

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


The following commit(s) were added to refs/heads/2.1 by this push:
     new 11824cf7a5 Use property in test that still exists in main
11824cf7a5 is described below

commit 11824cf7a56b0d3772863f8225c8ce057d541d0b
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Sep 14 16:57:29 2023 -0400

    Use property in test that still exists in main
    
    Use a property in AccumuloConfigurationIsPropertySetTest that still
    exists in the main branch, to make merging to main cleaner.
    
    Re #3676
---
 .../accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java
 
b/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java
index 4b7ae59a03..fb7dbb9542 100644
--- 
a/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java
+++ 
b/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java
@@ -23,7 +23,7 @@ import static java.util.stream.Collectors.toSet;
 import static org.apache.accumulo.core.conf.Property.GC_PORT;
 import static org.apache.accumulo.core.conf.Property.INSTANCE_SECRET;
 import static org.apache.accumulo.core.conf.Property.INSTANCE_ZK_HOST;
-import static 
org.apache.accumulo.core.conf.Property.MANAGER_BULK_TSERVER_REGEX;
+import static org.apache.accumulo.core.conf.Property.MANAGER_BULK_TIMEOUT;
 import static org.apache.accumulo.core.conf.Property.TABLE_BLOOM_ENABLED;
 import static org.apache.accumulo.core.conf.Property.TABLE_BLOOM_SIZE;
 import static org.apache.accumulo.core.conf.Property.TABLE_DURABILITY;
@@ -189,7 +189,7 @@ public class AccumuloConfigurationIsPropertySetTest extends 
WithTestNames {
 
   @Test
   public void testSiteConfiguration() throws IOException {
-    var shouldBeSet = Set.of(INSTANCE_ZK_HOST, INSTANCE_SECRET, 
MANAGER_BULK_TSERVER_REGEX);
+    var shouldBeSet = Set.of(INSTANCE_ZK_HOST, INSTANCE_SECRET, 
MANAGER_BULK_TIMEOUT);
     var shouldNotBeSet = Sets.difference(ALL_PROPERTIES, shouldBeSet);
     assertFalse(shouldNotBeSet.isEmpty());