Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
b2febbc6
Verified
Commit
b2febbc6
authored
Sep 06, 2018
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Specify optional tests with an environment variable.
parent
e12601dd
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
20 additions
and
34 deletions
+20
-34
bramble-android/build.gradle
bramble-android/build.gradle
+0
-5
bramble-api/build.gradle
bramble-api/build.gradle
+0
-5
bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java
...rc/test/java/org/briarproject/bramble/test/TestUtils.java
+7
-0
bramble-core/build.gradle
bramble-core/build.gradle
+0
-5
bramble-java/build.gradle
bramble-java/build.gradle
+0
-2
bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
.../java/org/briarproject/bramble/plugin/tor/BridgeTest.java
+5
-2
briar-android/build.gradle
briar-android/build.gradle
+0
-5
briar-api/build.gradle
briar-api/build.gradle
+0
-5
briar-core/build.gradle
briar-core/build.gradle
+0
-5
build.gradle
build.gradle
+8
-0
No files found.
bramble-android/build.gradle
View file @
b2febbc6
...
...
@@ -49,8 +49,3 @@ project.afterEvaluate {
into
'src/main/res/raw'
}
}
tasks
.
withType
(
Test
)
{
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
}
bramble-api/build.gradle
View file @
b2febbc6
...
...
@@ -31,8 +31,3 @@ task jarTest(type: Jar, dependsOn: testClasses) {
artifacts
{
testOutput
jarTest
}
tasks
.
withType
(
Test
)
{
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
}
bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java
View file @
b2febbc6
...
...
@@ -24,6 +24,7 @@ import java.util.Map;
import
java.util.Random
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
static
java
.
util
.
Arrays
.
asList
;
import
static
org
.
briarproject
.
bramble
.
api
.
identity
.
Author
.
FORMAT_VERSION
;
import
static
org
.
briarproject
.
bramble
.
api
.
identity
.
AuthorConstants
.
MAX_AUTHOR_NAME_LENGTH
;
import
static
org
.
briarproject
.
bramble
.
api
.
identity
.
AuthorConstants
.
MAX_PUBLIC_KEY_LENGTH
;
...
...
@@ -173,4 +174,10 @@ public class TestUtils {
Collection
<?
extends
Number
>
samples
)
{
return
Math
.
sqrt
(
getVariance
(
samples
));
}
public
static
boolean
isOptionalTestEnabled
(
Class
testClass
)
{
String
optionalTests
=
System
.
getenv
(
"OPTIONAL_TESTS"
);
return
optionalTests
!=
null
&&
asList
(
optionalTests
.
split
(
","
)).
contains
(
testClass
.
getName
());
}
}
bramble-core/build.gradle
View file @
b2febbc6
...
...
@@ -44,8 +44,3 @@ task jarTest(type: Jar, dependsOn: testClasses) {
artifacts
{
testOutput
jarTest
}
tasks
.
withType
(
Test
)
{
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
}
bramble-java/build.gradle
View file @
b2febbc6
...
...
@@ -40,7 +40,5 @@ project.afterEvaluate {
}
tasks
.
withType
(
Test
)
{
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
systemProperty
'java.library.path'
,
'libs'
}
bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
View file @
b2febbc6
...
...
@@ -12,7 +12,6 @@ import org.briarproject.bramble.test.BrambleTestCase;
import
org.briarproject.bramble.test.DaggerBrambleJavaIntegrationTestComponent
;
import
org.junit.AfterClass
;
import
org.junit.Before
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
java.io.File
;
...
...
@@ -28,11 +27,12 @@ import static java.util.Collections.singletonList;
import
static
java
.
util
.
concurrent
.
TimeUnit
.
SECONDS
;
import
static
org
.
briarproject
.
bramble
.
test
.
TestUtils
.
deleteTestDirectory
;
import
static
org
.
briarproject
.
bramble
.
test
.
TestUtils
.
getTestDirectory
;
import
static
org
.
briarproject
.
bramble
.
test
.
TestUtils
.
isOptionalTestEnabled
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
junit
.
Assert
.
fail
;
import
static
org
.
junit
.
Assume
.
assumeTrue
;
@Ignore
(
"Might fail non-deterministically when bridges are down"
)
public
class
BridgeTest
extends
BrambleTestCase
{
private
final
static
long
TIMEOUT
=
SECONDS
.
toMillis
(
23
);
...
...
@@ -61,6 +61,9 @@ public class BridgeTest extends BrambleTestCase {
@Before
public
void
setUp
()
{
// Skip this test unless it's explicitly enabled in the environment
assumeTrue
(
isOptionalTestEnabled
(
BridgeTest
.
class
));
BrambleJavaIntegrationTestComponent
component
=
DaggerBrambleJavaIntegrationTestComponent
.
builder
().
build
();
component
.
inject
(
this
);
...
...
briar-android/build.gradle
View file @
b2febbc6
...
...
@@ -184,8 +184,3 @@ task verifyTranslations {
project
.
afterEvaluate
{
preBuild
.
dependsOn
.
add
(
verifyTranslations
)
}
tasks
.
withType
(
Test
)
{
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
}
briar-api/build.gradle
View file @
b2febbc6
...
...
@@ -11,8 +11,3 @@ dependencies {
signature
'org.codehaus.mojo.signature:java16:1.1@signature'
}
tasks
.
withType
(
Test
)
{
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
}
briar-core/build.gradle
View file @
b2febbc6
...
...
@@ -32,8 +32,3 @@ dependencies {
signature
'org.codehaus.mojo.signature:java16:1.1@signature'
}
tasks
.
withType
(
Test
)
{
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
}
build.gradle
View file @
b2febbc6
...
...
@@ -6,6 +6,14 @@ allprojects {
mavenLocal
()
google
()
}
afterEvaluate
{
tasks
.
withType
(
Test
)
{
// Allow tests to be re-run if any optional tests are enabled
outputs
.
upToDateWhen
{
System
.
getenv
(
"OPTIONAL_TESTS"
)
==
null
}
// Use entropy-gathering device specified on command line, if any
systemProperty
'java.security.egd'
,
System
.
getProperty
(
'java.security.egd'
)
}
}
}
buildscript
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment