This is an automated email from the ASF dual-hosted git repository. domgarguilo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a055803a09d015a82607e7c113685b6d965db183 Merge: 1ca2509423 9da766e479 Author: Dom Garguilo <[email protected]> AuthorDate: Tue Mar 10 12:27:06 2026 -0400 Merge branch '2.1' into main .../core/iteratorsImpl/IteratorProperty.java | 3 ++- .../core/iteratorsImpl/IteratorConfigUtilTest.java | 21 +++++++++++++++++++++ .../accumulo/test/NamespacesIT_SimpleSuite.java | 5 ++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --cc test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java index f8cdf27292,2b9ac5c346..9a86c28071 --- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java @@@ -408,10 -410,9 +408,9 @@@ public class NamespacesIT_SimpleSuite e c.namespaceOperations().checkIteratorConflicts(namespace, setting, EnumSet.allOf(IteratorScope.class)); c.namespaceOperations().attachIterator(namespace, setting); - sleepUninterruptibly(2, TimeUnit.SECONDS); + Thread.sleep(SECONDS.toMillis(2)); - var e = assertThrows(AccumuloException.class, () -> c.namespaceOperations() - .checkIteratorConflicts(namespace, setting, EnumSet.allOf(IteratorScope.class))); - assertEquals(IllegalArgumentException.class, e.getCause().getClass()); + c.namespaceOperations().checkIteratorConflicts(namespace, setting, + EnumSet.allOf(IteratorScope.class)); IteratorSetting setting2 = c.namespaceOperations().getIteratorSetting(namespace, setting.getName(), IteratorScope.scan); assertEquals(setting, setting2);
