More intermittent test failure fixes

This commit is contained in:
jamesagnew 2018-08-19 16:51:04 -04:00
parent cbe02555b4
commit fef105cfdb
2 changed files with 3 additions and 3 deletions

View File

@ -61,10 +61,10 @@ public abstract class BaseResourceProviderR4Test extends BaseJpaR4Test {
protected static ISearchDao mySearchEntityDao; protected static ISearchDao mySearchEntityDao;
protected static ISearchCoordinatorSvc mySearchCoordinatorSvc; protected static ISearchCoordinatorSvc mySearchCoordinatorSvc;
protected static GenericWebApplicationContext ourWebApplicationContext; protected static GenericWebApplicationContext ourWebApplicationContext;
protected static SubscriptionRestHookInterceptor ourReskHookSubscriptionInterceptor;
private static Server ourServer; private static Server ourServer;
protected IGenericClient ourClient; protected IGenericClient ourClient;
protected ResourceCountCache ourResourceCountsCache; protected ResourceCountCache ourResourceCountsCache;
protected static SubscriptionRestHookInterceptor ourReskHookSubscriptionInterceptor;
private TerminologyUploaderProviderR4 myTerminologyUploaderProvider; private TerminologyUploaderProviderR4 myTerminologyUploaderProvider;
private Object ourGraphQLProvider; private Object ourGraphQLProvider;
private boolean ourRestHookSubscriptionInterceptorRequested; private boolean ourRestHookSubscriptionInterceptorRequested;
@ -207,7 +207,7 @@ public abstract class BaseResourceProviderR4Test extends BaseJpaR4Test {
} }
protected void waitForRegisteredSubscriptionCount(int theSize) throws Exception { protected void waitForRegisteredSubscriptionCount(int theSize) throws Exception {
for (int i = 0; i++;) { for (int i = 0; ; i++) {
if (i == 10) { if (i == 10) {
fail("Failed to init subscriptions"); fail("Failed to init subscriptions");
} }

View File

@ -109,7 +109,7 @@ public class WebsocketWithSubscriptionIdDstu2Test extends BaseResourceProviderDs
ClientUpgradeRequest request = new ClientUpgradeRequest(); ClientUpgradeRequest request = new ClientUpgradeRequest();
ourLog.info("Connecting to : {}", echoUri); ourLog.info("Connecting to : {}", echoUri);
Future<Session> connection = myWebSocketClient.connect(mySocketImplementation, echoUri, request); Future<Session> connection = myWebSocketClient.connect(mySocketImplementation, echoUri, request);
Session session = connection.get(2, TimeUnit.SECONDS); Session session = connection.get(20, TimeUnit.SECONDS);
ourLog.info("Connected to WS: {}", session.isOpen()); ourLog.info("Connected to WS: {}", session.isOpen());
} }