From b7461fd3ef5a3564f8da0ab468a7db5a245899c8 Mon Sep 17 00:00:00 2001 From: tholenst Date: Wed, 30 Nov 2022 04:51:24 -0800 Subject: Remove calls to "isRemoteBuildExcecution" and always return false. We don't test Tink on RBE anymore. PiperOrigin-RevId: 491883358 --- .../src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java | 3 --- .../java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java | 3 --- .../com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java | 3 --- .../java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java | 3 --- 4 files changed, 12 deletions(-) (limited to 'tools') diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java index 8766c26ea..9688fd700 100644 --- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java +++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java @@ -18,7 +18,6 @@ package com.google.crypto.tink.tinkey; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; import com.google.crypto.tink.KeyTemplate; import com.google.crypto.tink.KeyTemplates; @@ -110,8 +109,6 @@ public class AddKeyCommandTest { @Test public void testAddEncrypted_shouldAddNewKey() throws Exception { - // This test requires KMS/internet access and thus cannot run on RBE. - assumeFalse(TestUtil.isRemoteBuildExecution()); // Create an input stream containing an encrypted keyset. String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI; String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE; diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java index b67b108ce..15ef662df 100644 --- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java +++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java @@ -17,7 +17,6 @@ package com.google.crypto.tink.tinkey; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assume.assumeFalse; import com.google.crypto.tink.KeyTemplate; import com.google.crypto.tink.KeyTemplates; @@ -74,8 +73,6 @@ public class CreateKeysetCommandTest { private void testCreateEncrypted_shouldCreateNewKeyset( String outFormat) throws Exception { - // This test requires KMS/internet access and thus cannot run on RBE. - assumeFalse(TestUtil.isRemoteBuildExecution()); // Create an encrypted keyset. String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI; String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE; diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java index ccfed4de9..a95d64d8d 100644 --- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java +++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java @@ -17,7 +17,6 @@ package com.google.crypto.tink.tinkey; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assume.assumeFalse; import com.google.crypto.tink.CleartextKeysetHandle; import com.google.crypto.tink.HybridDecrypt; @@ -118,8 +117,6 @@ public class CreatePublicKeysetCommandTest { private void testCreate_encryptedPrivate_shouldCreateCleartextPublic( KeyTemplate template, KeyType type) throws Exception { - // This test requires KMS/internet access and thus cannot run on RBE. - assumeFalse(TestUtil.isRemoteBuildExecution()); // Create an input stream containing a cleartext private keyset. String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI; String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE; diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java index 69cf315b4..4f03c0c17 100644 --- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java +++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java @@ -18,7 +18,6 @@ package com.google.crypto.tink.tinkey; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; import com.google.crypto.tink.KeyTemplate; import com.google.crypto.tink.KeyTemplates; @@ -110,8 +109,6 @@ public class RotateKeysetCommandTest { @Test public void testRotateEncrypted_shouldAddNewKey() throws Exception { - // This test requires KMS/internet access and thus cannot run on RBE. - assumeFalse(TestUtil.isRemoteBuildExecution()); // Create an input stream containing an encrypted keyset. String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI; String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE; -- cgit v1.2.3