fix leftovers

Alluxio · Oct 25, 2023 · 28ad411 · 28ad411
1 parent e604f92
commit 28ad411
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/dora/core/server/master/src/test/java/alluxio/underfs/UfsStatusCacheTest.java b/dora/core/server/master/src/test/java/alluxio/underfs/UfsStatusCacheTest.java
@@ -468,14 +468,8 @@ private void spyUfs() {
             .build());
     MasterUfsManager manager = new MasterUfsManager();
     manager.getRoot(); // add root mount
-<<<<<<< HEAD
-    manager.mUnderFileSystemMap.put(new AbstractUfsManager.Key(new AlluxioURI("/")), mUfs);
-||||||| parent of 4ff13c31ea (other changes to make dep injection happen)
-    manager.mUnderFileSystemMap.put(new AbstractUfsManager.Key(new AlluxioURI("/"), null), mUfs);
-=======
     manager.mUnderFileSystemMap.put(new AbstractUfsManager.Key(new AlluxioURI("/")), mUfs);
 //    manager.mUnderFileSystemMap.put(new AbstractUfsManager.Key(new AlluxioURI("/"), null), mUfs);
->>>>>>> 4ff13c31ea (other changes to make dep injection happen)
     mMountTable = new MountTable(manager, rootMountInfo, Clock.systemUTC());
   }
 

diff --git a/dora/core/server/worker/src/test/java/alluxio/worker/dora/DoraMetaManagerTest.java b/dora/core/server/worker/src/test/java/alluxio/worker/dora/DoraMetaManagerTest.java
@@ -57,7 +57,7 @@ public void before() throws IOException {
     PagedDoraWorker worker = mock(PagedDoraWorker.class);
     CacheManager cacheManager = mock(CacheManager.class);
     mDoraUfsManager = mock(DoraUfsManager.class);
-    mManager = new DoraMetaManager(conf, worker, cacheManager, mDoraUfsManager);
+    mManager = new DoraMetaManager(conf, cacheManager, mDoraUfsManager);
   }
 
   @After