Skip to content

test: Restore old behavior of timeout per script line #6647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niloc132 merged 2 commits into from
Feb 14, 2025
Merged

test: Restore old behavior of timeout per script line #6647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8001621
test: Restore old behavior of timeout per script line
niloc132 Feb 14, 2025
5c1062a
spotless
niloc132 Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions web/client-api/src/test/java/io/deephaven/web/client/api/AbstractAsyncGwtTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,21 @@ protected Promise<IdeSession> connect(TableSourceBuilder tables) {
}

private Promise<IdeSession> runAllScriptsInOrder(IdeSession session, List<String> code) {
String block = String.join("\n", code);
delayTestFinish(4000);
return session.runCode(block).then(ignore -> Promise.resolve(session));
Promise<IdeSession> result = Promise.resolve(session);
for (int i = 0; i < code.size(); i++) {
final int index = i;
result = result.then(ignore -> {
delayTestFinish(4000 + index);

return session.runCode(code.get(index));
}).then(r -> {
if (r.getError() != null) {
return Promise.reject(r.getError());
}
return Promise.resolve(session);
});
}
return result;
}

public IThenable.ThenOnFulfilledCallbackFn<IdeSession, JsTable> table(String tableName) {
Expand Down
6 changes: 3 additions & 3 deletions web/client-api/src/test/java/io/deephaven/web/client/api/widget/plot/ChartDataTestGwt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public class ChartDataTestGwt extends AbstractAsyncGwtTestCase {
"my_col_defs = {\"ID\": dht.int32, \"Value\": dht.string, \"Deleted\": dht.bool_}",
"ug = jpy.get_type('io.deephaven.engine.updategraph.impl.EventDrivenUpdateGraph').newBuilder('test').existingOrBuild()",
"exec_ctx = ExecutionContext(get_exec_ctx().j_object.withUpdateGraph(ug))",
"with exec_ctx:",
" input = input_table(col_defs=my_col_defs, key_cols=\"ID\")",
" result = input.without_attributes('InputTable').where(\"!Deleted\").sort(\"ID\")");
"with exec_ctx:\n" +
" input = input_table(col_defs=my_col_defs, key_cols=\"ID\")\n" +
" result = input.without_attributes('InputTable').where(\"!Deleted\").sort(\"ID\")");

@Override
public String getModuleName() {
Expand Down