Merge branch '832-fix-bridge-test' into 'master' (77b2fa8a) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

77b2fa8a

Commit 77b2fa8a authored 6 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '832-fix-bridge-test' into 'master'

Fix Tor bridge integration test

See merge request briar/briar!875

parents 1de6c863 f9d58733

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/androidTest/java/org/briarproject/bramble/plugin/tor/BridgeTest.java 8 additions, 5 deletions

.../java/org/briarproject/bramble/plugin/tor/BridgeTest.java
bramble-android/src/androidTest/java/org/briarproject/bramble/test/ApplicationModule.java 20 additions, 0 deletions

...java/org/briarproject/bramble/test/ApplicationModule.java
bramble-android/src/androidTest/java/org/briarproject/bramble/test/BrambleAndroidIntegrationTestComponent.java 5 additions, 2 deletions

.../bramble/test/BrambleAndroidIntegrationTestComponent.java

with 33 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment