Buck: Acceptance tests depend unconditionally on bouncycastle
Since recent SSH daemon upgrades, in context of If047c3a27, loading
of BouncyCastle FileKeyPair provider depends on bouncycastle library.
If in doubt, check this comment from: FileKeyPairProvider.java:
Note that this class has a direct dependency on BouncyCastle and
won't work unless it has been correctly registered as a security
provider.
Change-Id: I7e93713be5cbbdd470ab8fbb4eec61c3cbc78194
diff --git a/gerrit-acceptance-tests/tests.defs b/gerrit-acceptance-tests/tests.defs
index 940b1cc..85cc78b 100644
--- a/gerrit-acceptance-tests/tests.defs
+++ b/gerrit-acceptance-tests/tests.defs
@@ -1,4 +1,3 @@
-# These are needed as workaround for the 'verify: false' bug in Jcraft SSH library
BOUNCYCASTLE = [
'//lib/bouncycastle:bcpkix',
'//lib/bouncycastle:bcpg',
@@ -11,16 +10,16 @@
labels = [],
source_under_test = [],
vm_args = ['-Xmx256m']):
- from os import environ, path
- if not environ.get('NO_BOUNCYCASTLE'):
- deps = BOUNCYCASTLE + deps
+ from os import path
if path.exists('/dev/urandom'):
vm_args = vm_args + ['-Djava.security.egd=file:/dev/./urandom']
java_test(
name = group,
srcs = srcs,
- deps = ['//gerrit-acceptance-tests:lib'] + deps,
+ deps = deps + BOUNCYCASTLE + [
+ '//gerrit-acceptance-tests:lib'
+ ],
source_under_test = [
'//gerrit-httpd:httpd',
'//gerrit-sshd:sshd',
