From 93486e0ccfb8342a262fa8316f09a63e2f68da9c Mon Sep 17 00:00:00 2001
From: Patrick Hiesel <hiesel@google.com>
Date: Thu, 16 Apr 2020 15:41:19 +0200
Subject: [PATCH] RulesIT: Evict cached results instead of disabling cache

Change-Id: I40d5cf441ec43b116eadc18b512558422342f3ff
---
 .../google/gerrit/acceptance/server/rules/RulesIT.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java b/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java
index e5432d18f2..18ae6c4112 100644
--- a/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java
@@ -29,7 +29,6 @@ import com.google.inject.Inject;
 import java.util.Collection;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.Repository;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -44,14 +43,6 @@ public class RulesIT extends AbstractDaemonTest {
   @Inject private ProjectOperations projectOperations;
   @Inject private SubmitRuleEvaluator.Factory evaluatorFactory;
 
-  @Before
-  public void setUp() {
-    // We don't want caches to interfere with our tests. If we didn't, the cache would take
-    // precedence over the index, which would never be called.
-    baseConfig.setString("cache", "changes", "memoryLimit", "0");
-    baseConfig.setString("cache", "projects", "memoryLimit", "0");
-  }
-
   @Test
   public void testUnresolvedCommentsCountPredicate() throws Exception {
     modifySubmitRules("gerrit:unresolved_comments_count(0)");
@@ -119,5 +110,6 @@ public class RulesIT extends AbstractDaemonTest {
           .message("Modify rules.pl")
           .create();
     }
+    projectCache.evict(project);
   }
 }