commit 35fa54c41fa1c7fdd7f4b19073f92924f1980a46
author Dave Borowitz <dborowitz@google.com> Wed Dec 12 14:43:54 2018 -0800
committer Dave Borowitz <dborowitz@google.com> Thu Dec 13 06:49:02 2018 -0800
tree dd88cfbc6ccc3e0e6f3de29a5818a73c97be068c
parent a34a427f167fac64b583a4951531d75838d7d325

ChangeReviewersByEmailIT: Use enableDb/disableDb helper methods

Callers shouldn't depend on the implementation detail of the
NotesMigration, and the implementation will change soon.

Change-Id: I3286ca32efa185cac5066a0c49d758fcae0949b9

javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java

diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
index 2a397e4..7b302c4 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.acceptance.AcceptanceTestRequestScope.Context;
 import com.google.gerrit.acceptance.PushOneCommit;
 import com.google.gerrit.acceptance.RestResponse;
 import com.google.gerrit.extensions.api.changes.AddReviewerInput;
@@ -319,14 +320,14 @@
       input.state = state;
       gApi.changes().id(r.getChangeId()).addReviewer(input);
 
-      notesMigration.setFailOnLoadForTest(true);
+      Context oldCtx = disableDb();
       try {
         ChangeInfo info =
             Iterables.getOnlyElement(
                 gApi.changes().query(r.getChangeId()).withOption(DETAILED_LABELS).get());
         assertThat(info.reviewers).isEqualTo(ImmutableMap.of(state, ImmutableList.of(acc)));
       } finally {
-        notesMigration.setFailOnLoadForTest(false);
+        enableDb(oldCtx);
       }
     }
   }