[cassandra] 01/02: Merge branch 'cassandra-3.11' into cassandra-4.0

[br...@apache.org]

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

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit fa6dbc4dda3897d575a2f56542665e30336be985
Merge: 57c1c61 b3af67f
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Sep 17 08:43:48 2021 -0500

    Merge branch 'cassandra-3.11' into cassandra-4.0

 .../org/apache/cassandra/auth/AuthCacheTest.java   | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --cc test/unit/org/apache/cassandra/auth/AuthCacheTest.java
index 217821e,c99438f7..da97225
--- a/test/unit/org/apache/cassandra/auth/AuthCacheTest.java
+++ b/test/unit/org/apache/cassandra/auth/AuthCacheTest.java
@@@ -28,9 -27,7 +28,10 @@@ import org.apache.cassandra.db.Consiste
  import org.apache.cassandra.exceptions.UnavailableException;
  
  import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertNull;
 +import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.fail;
  
  public class AuthCacheTest
  {
@@@ -211,6 -166,16 +235,16 @@@
          return Integer.parseInt(s);
      }
  
+     private Integer countingLoaderWithException(String s)
+     {
+         Integer loadedValue = countingLoader(s);
+ 
+         if (loadCounter > 1)
 -            throw new UnavailableException(ConsistencyLevel.QUORUM, 3, 1);
++            throw UnavailableException.create(ConsistencyLevel.QUORUM, 3, 1);
+ 
+         return loadedValue;
+     }
+ 
      private static class TestCache<K, V> extends AuthCache<K, V>
      {
          private static int nameCounter = 0; // Allow us to create many instances of cache with same name prefix

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org