Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-8422: separate retry and request timeouts
[controller.git]
/
opendaylight
/
md-sal
/
cds-access-client
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
access
/
client
/
ConnectingClientConnectionTest.java
diff --git
a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java
b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java
index 8274d24ce24435e32c6cf8bfa73fa9f898f52b21..b43642955b2a8454dcf9a7ec5a98353de11a58cd 100644
(file)
--- a/
opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java
+++ b/
opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java
@@
-191,7
+191,7
@@
public class ConnectingClientConnectionTest {
@Test
public void testSendRequestNeedsBackend() {
queue.sendRequest(mockRequest, mockCallback);
@Test
public void testSendRequestNeedsBackend() {
queue.sendRequest(mockRequest, mockCallback);
- final Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ final Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNotNull(ret);
assertTrue(ret.isPresent());
}
assertNotNull(ret);
assertTrue(ret.isPresent());
}
@@
-207,7
+207,7
@@
public class ConnectingClientConnectionTest {
setupBackend();
queue.sendRequest(mockRequest, mockCallback);
setupBackend();
queue.sendRequest(mockRequest, mockCallback);
- final Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ final Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNotNull(ret);
assertTrue(ret.isPresent());
assertTransmit(mockRequest, 0);
assertNotNull(ret);
assertTrue(ret.isPresent());
assertTransmit(mockRequest, 0);
@@
-215,7
+215,7
@@
public class ConnectingClientConnectionTest {
@Test
public void testRunTimeoutEmpty() throws NoProgressException {
@Test
public void testRunTimeoutEmpty() throws NoProgressException {
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNotNull(ret);
assertFalse(ret.isPresent());
}
assertNotNull(ret);
assertFalse(ret.isPresent());
}
@@
-223,7
+223,7
@@
public class ConnectingClientConnectionTest {
@Test
public void testRunTimeoutWithoutShift() throws NoProgressException {
queue.sendRequest(mockRequest, mockCallback);
@Test
public void testRunTimeoutWithoutShift() throws NoProgressException {
queue.sendRequest(mockRequest, mockCallback);
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNotNull(ret);
assertTrue(ret.isPresent());
}
assertNotNull(ret);
assertTrue(ret.isPresent());
}
@@
-232,9
+232,9
@@
public class ConnectingClientConnectionTest {
public void testRunTimeoutWithTimeoutLess() throws NoProgressException {
queue.sendRequest(mockRequest, mockCallback);
public void testRunTimeoutWithTimeoutLess() throws NoProgressException {
queue.sendRequest(mockRequest, mockCallback);
- ticker.advance(AbstractClientConnection.
REQUEST
_TIMEOUT_NANOS - 1);
+ ticker.advance(AbstractClientConnection.
BACKEND_ALIVE
_TIMEOUT_NANOS - 1);
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNotNull(ret);
assertTrue(ret.isPresent());
}
assertNotNull(ret);
assertTrue(ret.isPresent());
}
@@
-245,9
+245,9
@@
public class ConnectingClientConnectionTest {
queue.sendRequest(mockRequest, mockCallback);
queue.sendRequest(mockRequest, mockCallback);
- ticker.advance(AbstractClientConnection.
REQUEST
_TIMEOUT_NANOS);
+ ticker.advance(AbstractClientConnection.
BACKEND_ALIVE
_TIMEOUT_NANOS);
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNull(ret);
}
assertNull(ret);
}
@@
-257,9
+257,9
@@
public class ConnectingClientConnectionTest {
queue.sendRequest(mockRequest, mockCallback);
queue.sendRequest(mockRequest, mockCallback);
- ticker.advance(AbstractClientConnection.
REQUEST
_TIMEOUT_NANOS + 1);
+ ticker.advance(AbstractClientConnection.
BACKEND_ALIVE
_TIMEOUT_NANOS + 1);
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNull(ret);
}
assertNull(ret);
}
@@
-290,7
+290,7
@@
public class ConnectingClientConnectionTest {
ticker.advance(AbstractClientConnection.NO_PROGRESS_TIMEOUT_NANOS);
// No problem
ticker.advance(AbstractClientConnection.NO_PROGRESS_TIMEOUT_NANOS);
// No problem
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNotNull(ret);
assertFalse(ret.isPresent());
}
assertNotNull(ret);
assertFalse(ret.isPresent());
}
@@
-300,7
+300,7
@@
public class ConnectingClientConnectionTest {
ticker.advance(AbstractClientConnection.NO_PROGRESS_TIMEOUT_NANOS + 1);
// No problem
ticker.advance(AbstractClientConnection.NO_PROGRESS_TIMEOUT_NANOS + 1);
// No problem
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNotNull(ret);
assertFalse(ret.isPresent());
}
assertNotNull(ret);
assertFalse(ret.isPresent());
}
@@
-348,7
+348,7
@@
public class ConnectingClientConnectionTest {
ticker.advance(AbstractClientConnection.NO_PROGRESS_TIMEOUT_NANOS - 11);
ticker.advance(AbstractClientConnection.NO_PROGRESS_TIMEOUT_NANOS - 11);
- Optional<
FiniteDuration
> ret = queue.checkTimeout(ticker.read());
+ Optional<
Long
> ret = queue.checkTimeout(ticker.read());
assertNull(ret);
}
assertNull(ret);
}