Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'scheduled-tests' into 'master'

Browse Source 
Run bridge tests in scheduled nightly tests (and fix merge pipelines)

See merge request briar/briar!1431
This commit is contained in:
akwizgran
2021-04-21 13:55:48 +00:00
parent a28a2360f1 f7a957150e
commit b0d86bef3e
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/PromoVideoTest.java
View File

@@ -87,7 +87,7 @@ public class PromoVideoTest extends ScreenshotTest {
// It takes a long time for SetupActivity to start after the splash,
// (because it is shown longer for videos), so increase timeout.
if (!isFilming) waitFor(SetupActivity.class, 20_000);
if (!isFilming) waitFor(SetupActivity.class, 30_000);
// Note: We use waiting code only when not filming,
// to make the test reliable for CI. Otherwise, we used fixed

4
briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java
View File

@@ -3,6 +3,8 @@ package org.briarproject.briar.android;
import android.app.Activity;
import android.util.Log;
import com.jraska.falcon.Falcon.UnableToTakeScreenshotException;
import org.briarproject.bramble.api.connection.ConnectionRegistry;
import org.briarproject.bramble.api.system.Clock;
import org.briarproject.briar.api.test.TestDataCreator;
@@ -34,6 +36,8 @@ public abstract class ScreenshotTest extends UiTest {
protected void screenshot(String name, Activity activity) {
try {
Screengrab.screenshot(name, new FalconScreenshotStrategy(activity));
} catch (UnableToTakeScreenshotException e) {
Log.e("Screengrab", "Error taking screenshot", e);
} catch (RuntimeException e) {
if (e.getMessage() == null ||
!e.getMessage().equals("Unable to capture screenshot."))