Skip to content
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

Fix: Timeout for unatted tests. #643

Merged
merged 5 commits into from
Dec 12, 2023
+11 −1
Merged

Fix: Timeout for unatted tests. #643

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a77bc8
Fix timeout for unatted tests.
aanorbel Dec 12, 2023
1726771
Updated indentation
aanorbel Dec 12, 2023
6e904a0
Updated indentation
aanorbel Dec 12, 2023
ee49646
Update app/src/main/java/org/openobservatory/ooniprobe/test/TestAsync…
bassosimone Dec 12, 2023
27b0df5
Update app/src/main/java/org/openobservatory/ooniprobe/test/TestAsync…
bassosimone Dec 12, 2023
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
12 changes: 11 additions & 1 deletion app/src/main/java/org/openobservatory/ooniprobe/test/TestAsyncTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,18 @@ private void downloadURLs() {

currentTest.setInputs(inputs);

if (currentTest.getMax_runtime() == null)
/*
* Set the maximum runtime if the test doesn't yet have it. This is only done if the test is not unattended.
* Previously, this was not required, because the code path for unattended tests
* did not call this method. However, now that we are using the same code path as of https://github.com/ooni/probe-android/pull/572,
* This is now required to ensure the manual tests follow the preference set by the user,
* while the unattended tests doesn't.
bassosimone marked this conversation as resolved.
Show resolved Hide resolved
*
* See https://github.com/ooni/probe/issues/2644.
*/
if (currentTest.getMax_runtime() == null && !unattended) {
currentTest.setMax_runtime(app.getPreferenceManager().getMaxRuntime());
}
publishProgress(URL);
} catch (Exception e) {
e.printStackTrace();
Expand Down
Loading