This is an automated email from the ASF dual-hosted git repository.
krathbun 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 806bdf9d91 fix failing NewTableConfigurationIT (#6037)
806bdf9d91 is described below
commit 806bdf9d91057cc8358278740422b7d398cbc564
Author: Kevin Rathbun <[email protected]>
AuthorDate: Tue Dec 23 13:02:51 2025 -0500
fix failing NewTableConfigurationIT (#6037)
---
.../java/org/apache/accumulo/test/NewTableConfigurationIT.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
index db9564ff77..bf044eb385 100644
--- a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
@@ -536,12 +536,12 @@ public class NewTableConfigurationIT extends
SharedMiniClusterBase {
var iterator1 = new IteratorSetting(20, "foo", "foo.bar");
var exception = assertThrows(IllegalStateException.class, () ->
client.tableOperations()
.create(table, new
NewTableConfiguration().attachIterator(iterator1)));
- assertTrue(exception.getMessage().contains("iterator priority
conflict"));
+ assertTrue(exception.getMessage().contains("conflict with default table
iterator"));
// add an iterator with same name as the default iterator
var iterator2 = new IteratorSetting(10, "vers", "foo.bar");
exception = assertThrows(IllegalStateException.class, () ->
client.tableOperations()
.create(table, new
NewTableConfiguration().attachIterator(iterator2)));
- assertTrue(exception.getMessage().contains("iterator name conflict"));
+ assertTrue(exception.getMessage().contains("conflict with default table
iterator"));
// try to attach the exact default iterators, should not present a
conflict as they are
// equivalent to what would be added
IteratorConfigUtil.getInitialTableIteratorSettings().forEach((setting,
scopes) -> {
@@ -563,7 +563,7 @@ public class NewTableConfigurationIT extends
SharedMiniClusterBase {
}
exception = assertThrows(IllegalStateException.class, () ->
client.tableOperations()
.create(table2, new NewTableConfiguration().setProperties(props)));
- assertTrue(exception.getMessage().contains("iterator priority
conflict"));
+ assertTrue(exception.getMessage().contains("conflict with default table
iterator"));
props.clear();
// add an iterator with same name as the default iterator
for (IteratorScope iterScope : IteratorScope.values()) {
@@ -571,7 +571,7 @@ public class NewTableConfigurationIT extends
SharedMiniClusterBase {
}
exception = assertThrows(IllegalStateException.class, () ->
client.tableOperations()
.create(table2, new NewTableConfiguration().setProperties(props)));
- assertTrue(exception.getMessage().contains("iterator name conflict"));
+ assertTrue(exception.getMessage().contains("conflict with default table
iterator"));
props.clear();
// try to attach the exact default iterators, should not present a
conflict as they are
// equivalent to what would be added
