From 7748ef072d4f60d7934f1103c670bbaea27f22df Mon Sep 17 00:00:00 2001 From: mmuller Date: Fri, 11 Aug 2017 13:48:34 -0700 Subject: [PATCH] Set "Development" environment in RDE upload test Set SystemProperty.environment to "Development" so we don't try to actually use GCS. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=165019677 --- javatests/google/registry/rde/RdeUploadActionTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/javatests/google/registry/rde/RdeUploadActionTest.java b/javatests/google/registry/rde/RdeUploadActionTest.java index 81b788f33..4e321a7aa 100644 --- a/javatests/google/registry/rde/RdeUploadActionTest.java +++ b/javatests/google/registry/rde/RdeUploadActionTest.java @@ -40,6 +40,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import com.google.appengine.api.taskqueue.QueueFactory; +import com.google.appengine.api.utils.SystemProperty; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; @@ -146,7 +147,6 @@ public class RdeUploadActionTest { private final FakeResponse response = new FakeResponse(); private final EscrowTaskRunner runner = mock(EscrowTaskRunner.class); private final FakeClock clock = new FakeClock(DateTime.parse("2010-10-17TZ")); - private final GcsService gcsService = GcsServiceFactory.createGcsService(); private final RydeTarOutputStreamFactory tarFactory = new RydeTarOutputStreamFactory() { @@ -230,8 +230,14 @@ public class RdeUploadActionTest { return jschSpy; } + private GcsService gcsService; + @Before public void before() throws Exception { + // Force "development" mode so we don't try to really connect to GCS. + SystemProperty.environment.set(SystemProperty.Environment.Value.Development); + gcsService = GcsServiceFactory.createGcsService(); + createTld("tld"); PGPPublicKey encryptKey = new FakeKeyringModule().get().getRdeStagingEncryptionKey(); writeGcsFile(gcsService, GHOSTRYDE_FILE,