Skip to content

Commit

Permalink
watcher tests - increase stop timeout to 60s (#45679) (#45934)
Browse files Browse the repository at this point in the history
As of #43939 Watcher tests now correctly block until all Watch executions
kicked off by that test are finished. Prior we allowed tests to finish with
outstanding watch executions. It was known that this would increase the
time needed to finish a test. However, running the tests on CI can be slow
and on at least 1 occasion it took 60s to actually finish.

This PR simply increases the max allowable timeout for Watcher tests
to clean up after themselves.
  • Loading branch information
jakelandis authored Aug 26, 2019
1 parent a3d918b commit f2241a1
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ protected void stopWatcher() throws Exception {
}

throw new AssertionError("unexpected state, retrying with next run");
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}

public static class NoopEmailService extends EmailService {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void stopWatcher() throws Exception {
default:
throw new AssertionError("unknown state[" + state + "]");
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void stopWatcher() throws Exception {
} catch (IOException e) {
throw new AssertionError(e);
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);

adminClient().performRequest(new Request("DELETE", "/my_test_index"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void stopWatcher() throws Exception {
default:
throw new AssertionError("unknown state[" + state + "]");
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ public void stopWatcher() throws Exception {
default:
throw new AssertionError("unknown state[" + state + "]");
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ public void stopWatcher() throws Exception {
} catch (IOException e) {
throw new AssertionError(e);
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ public void stopWatcher() throws Exception {
} catch (IOException e) {
throw new AssertionError(e);
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ public void stopWatcher() throws Exception {
} catch (IOException e) {
throw new AssertionError(e);
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}

0 comments on commit f2241a1

Please sign in to comment.