Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump to odlparent 2.0.0
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DistributedDataStoreRemotingIntegrationTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
index c52e4a39a2bd845a1952051bd1ae774f96b00311..dad3f1b223cb4a60646c7a90f5d5725bc65e9bb4 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
@@
-42,6
+42,7
@@
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
import org.junit.After;
import org.junit.Assume;
import java.util.concurrent.atomic.AtomicLong;
import org.junit.After;
import org.junit.Assume;
@@
-118,7
+119,7
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
@Parameters(name = "{0}")
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
@Parameters(name = "{0}")
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
- { DistributedDataStore.class, 7}, { ClientBackedDataStore.class,
6
0 }
+ { DistributedDataStore.class, 7}, { ClientBackedDataStore.class,
12
0 }
});
}
});
}
@@
-1024,6
+1025,10
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
final String msg = "Unexpected exception: " + Throwables.getStackTraceAsString(e.getCause());
assertTrue(msg, Throwables.getRootCause(e) instanceof NoShardLeaderException
|| e.getCause() instanceof ShardLeaderNotRespondingException);
final String msg = "Unexpected exception: " + Throwables.getStackTraceAsString(e.getCause());
assertTrue(msg, Throwables.getRootCause(e) instanceof NoShardLeaderException
|| e.getCause() instanceof ShardLeaderNotRespondingException);
+ assertEquals(DistributedDataStore.class, testParameter);
+ } catch (final TimeoutException e) {
+ // ClientBackedDataStore doesn't set cause to ExecutionException, future just time outs
+ assertEquals(ClientBackedDataStore.class, testParameter);
}
}
}
}
@@
-1058,6
+1063,10
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
final String msg = "Expected instance of NoShardLeaderException, actual: \n"
+ Throwables.getStackTraceAsString(e.getCause());
assertTrue(msg, Throwables.getRootCause(e) instanceof NoShardLeaderException);
final String msg = "Expected instance of NoShardLeaderException, actual: \n"
+ Throwables.getStackTraceAsString(e.getCause());
assertTrue(msg, Throwables.getRootCause(e) instanceof NoShardLeaderException);
+ assertEquals(DistributedDataStore.class, testParameter);
+ } catch (TimeoutException e) {
+ // ClientBackedDataStore doesn't set cause to ExecutionException, future just time outs
+ assertEquals(ClientBackedDataStore.class, testParameter);
}
}
}
}