2 files changed, 1 insertions, 27 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java
index f08396ccaf..6d2c9f7f1a 100644
--- a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java
@@ -66,7 +66,7 @@ public abstract class KeyedLockerTest {
     return new Supplier<KeyedLocker.AutoUnlocker>() {
       @Override
       public AutoUnlocker get() {
-        return locker.lock(key);
+        return locker.writeLock(key);
       }
     };
   }
diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/RefCountedMultisetKeyedLockerTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/RefCountedMultisetKeyedLockerTest.java
deleted file mode 100644
index 917c3e7511..0000000000
--- a/src/test/java/com/google/devtools/build/lib/concurrent/RefCountedMultisetKeyedLockerTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.lib.concurrent;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link RefCountedMultisetKeyedLocker}. */
-@RunWith(JUnit4.class)
-public class RefCountedMultisetKeyedLockerTest extends KeyedLockerTest {
- @Override
- protected KeyedLocker<String> makeFreshLocker() {
-  return new RefCountedMultisetKeyedLocker<>();
- }
-}