diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-01-25 12:38:53 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-01-25 12:38:53 +0100 |
commit | 140a13fb1820e08fe2f279e7644eee5a851adf3c (patch) | |
tree | c3d6646d4946212eee16ce3b13f3937c765e36be /vespaclient-container-plugin | |
parent | 9c868d0c4c25488facd7843f12e07dfc6f2353b8 (diff) |
Adjust expected remaining time since timeout is now dynamically adjusted.
Diffstat (limited to 'vespaclient-container-plugin')
-rwxr-xr-x | vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java b/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java index 23eddfceb14..3dd9b5526d7 100755 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java @@ -284,7 +284,7 @@ public class GetSearcherTestCase { String config = "raw:timeout 458\nroute \"riksveg18\"\nretryenabled true"; DocumentSessionFactory factory = new DocumentSessionFactory(docType); GetSearcher searcher = new GetSearcher(new FeedContext( - new MessagePropertyProcessor(new FeederConfig(new FeederConfig.Builder().timeout(458).route("riksveg18").retryenabled(true)), + new MessagePropertyProcessor(new FeederConfig(new FeederConfig.Builder().timeout(58).route("riksveg18").retryenabled(true)), defLoadTypeCfg), factory, docMan, new ClusterList(), new NullFeedMetric())); Chain<Searcher> searchChain = new Chain<>(searcher); @@ -302,7 +302,7 @@ public class GetSearcherTestCase { assertEquals("[all]", gdm.getFieldSet()); assertEquals(Route.parse("riksveg18"), gdm.getRoute()); assertTrue(gdm.getRetryEnabled()); - assertEquals(458000, gdm.getTimeRemaining()); + assertTrue(58000 >= gdm.getTimeRemaining()); } factory.messages.clear(); @@ -330,7 +330,7 @@ public class GetSearcherTestCase { assertEquals("[all]", gdm.getFieldSet()); assertEquals(Route.parse("e6"), gdm.getRoute()); assertFalse(gdm.getRetryEnabled()); - assertEquals(123000, gdm.getTimeRemaining()); + assertTrue(123000 >= gdm.getTimeRemaining()); } } @@ -343,9 +343,10 @@ public class GetSearcherTestCase { Chain<Searcher> searchChain = new Chain<>(searcher); Result result = new Execution(searchChain, Execution.Context.createContextStub()).search( - newQuery("?id[0]=userdoc:kittens:1:2&id[1]=userdoc:kittens:3:4&priority=LOW_2&route=highwaytohell&timeout=458")); + newQuery("?id[0]=userdoc:kittens:1:2&id[1]=userdoc:kittens:3:4&priority=LOW_2&route=highwaytohell&timeout=58")); assertEquals(2, factory.messages.size()); + long lastTimeout = 58000; { Message m = factory.messages.get(0); assertEquals(DocumentProtocol.MESSAGE_GETDOCUMENT, m.getType()); @@ -355,7 +356,8 @@ public class GetSearcherTestCase { assertEquals("[all]", gdm.getFieldSet()); assertEquals(DocumentProtocol.Priority.LOW_2, gdm.getPriority()); assertEquals(Route.parse("highwaytohell"), gdm.getRoute()); - assertEquals(458000, gdm.getTimeRemaining()); + assertTrue(lastTimeout >= gdm.getTimeRemaining()); + lastTimeout = gdm.getTimeRemaining(); } { @@ -367,7 +369,7 @@ public class GetSearcherTestCase { assertEquals("[all]", gdm.getFieldSet()); assertEquals(DocumentProtocol.Priority.LOW_2, gdm.getPriority()); assertEquals(Route.parse("highwaytohell"), gdm.getRoute()); - assertEquals(458000, gdm.getTimeRemaining()); + assertTrue(lastTimeout >= gdm.getTimeRemaining()); } } |