Fix tests

bazelbuild · Jul 10, 2019 · ec693c7 · ec693c7
1 parent 4ad873c
commit ec693c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java
@@ -201,6 +201,7 @@ public PathFragment getExecPath() {
     FileSystemUtils.createDirectoryAndParents(stderr.getParentDirectory());
     outErr = new FileOutErr(stdout, stderr);
     RemoteOptions remoteOptions = Options.getDefaults(RemoteOptions.class);
+    remoteOptions.remoteCache = "grpc://doesnotexist:90";
     RemoteRetrier retrier =
         TestUtils.newRemoteRetrier(
             () -> new ExponentialBackoff(remoteOptions),
@@ -219,6 +220,7 @@ public PathFragment getExecPath() {
         new SimpleBlobStoreActionCache(
             remoteOptions,
             SimpleBlobStoreFactory.create(
+                null,
                 remoteOptions,
                 channel.retain(),
                 creds,

diff --git a/src/test/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactoryTest.java b/src/test/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactoryTest.java
@@ -18,7 +18,7 @@
 import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 
 import com.google.devtools.build.lib.clock.JavaClock;
-import com.google.devtools.build.lib.remote.blobstore.CombinedDiskHttpBlobStore;
+import com.google.devtools.build.lib.remote.blobstore.CombinedDiskRemoteBlobStore;
 import com.google.devtools.build.lib.remote.blobstore.ConcurrentMapBlobStore;
 import com.google.devtools.build.lib.remote.blobstore.OnDiskBlobStore;
 import com.google.devtools.build.lib.remote.blobstore.SimpleBlobStore;
@@ -59,7 +59,7 @@ public void createCombinedCacheWithExistingWorkingDirectory() throws IOException
     SimpleBlobStore blobStore =
         SimpleBlobStoreFactory.create(remoteOptions, /* creds= */ null, workingDirectory);
 
-    assertThat(blobStore).isInstanceOf(CombinedDiskHttpBlobStore.class);
+    assertThat(blobStore).isInstanceOf(CombinedDiskRemoteBlobStore.class);
   }
 
   @Test
@@ -71,7 +71,7 @@ public void createCombinedCacheWithNotExistingWorkingDirectory() throws IOExcept
     SimpleBlobStore blobStore =
         SimpleBlobStoreFactory.create(remoteOptions, /* creds= */ null, workingDirectory);
 
-    assertThat(blobStore).isInstanceOf(CombinedDiskHttpBlobStore.class);
+    assertThat(blobStore).isInstanceOf(CombinedDiskRemoteBlobStore.class);
     assertThat(workingDirectory.exists()).isTrue();
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/remote/blobstore/grpc/GrpcBlobStoreTest.java b/src/test/java/com/google/devtools/build/lib/remote/blobstore/grpc/GrpcBlobStoreTest.java
@@ -227,9 +227,11 @@ private SimpleBlobStoreActionCache newClient(RemoteOptions remoteOptions, Suppli
     ByteStreamUploader uploader =
         new ByteStreamUploader(remoteOptions.remoteInstanceName, channel.retain(), creds,
             remoteOptions.remoteTimeout, retrier);
+    remoteOptions.remoteCache = "grpc://doesnotexist:90";
     return new SimpleBlobStoreActionCache(
         remoteOptions,
         SimpleBlobStoreFactory.create(
+            null,
             remoteOptions,
             channel.retain(),
             creds,