zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 00:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add debug logging to AppEngineRule

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=229983437
This commit is contained in:
weiminyu 2019-01-18 13:26:44 -08:00 • committed by Ben McIlwain
parent 5f87c3bff3
commit 80e71de723
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
javatests/google/registry/testing/AppEngineRule.java
View file

@ -32,6 +32,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.flogger.FluentLogger;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.googlecode.objectify.ObjectifyFilter; import com.googlecode.objectify.ObjectifyFilter;
import google.registry.model.ofy.ObjectifyService; import google.registry.model.ofy.ObjectifyService;
@ -70,6 +71,8 @@ import org.junit.runners.model.Statement;
*/ */
public final class AppEngineRule extends ExternalResource { public final class AppEngineRule extends ExternalResource {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
public static final String NEW_REGISTRAR_GAE_USER_ID = "666"; public static final String NEW_REGISTRAR_GAE_USER_ID = "666";
public static final String THE_REGISTRAR_GAE_USER_ID = "31337"; public static final String THE_REGISTRAR_GAE_USER_ID = "31337";
@ -346,7 +349,14 @@ public final class AppEngineRule extends ExternalResource {
try { try {
// To normalize the indexes, we are going to pass them through JSON and then rewrite the xml. // To normalize the indexes, we are going to pass them through JSON and then rewrite the xml.
JSONObject datastoreIndexes = new JSONObject(); JSONObject datastoreIndexes = new JSONObject();
Object indexes = toJSONObject(indexFile).get("datastore-indexes"); JSONObject indexFileObject = toJSONObject(indexFile);
if (!indexFileObject.has("datastore-indexes")) {
// Log for flaky appearance. We suspect that this is not a problem but need to inspect
// the content of this file to make sure.
// TODO(weiminyu): inspect file content and decide if this should be ignored.
logger.atWarning().log("Unexpected datastore-indexes-auto.xml:\n%s", indexFileObject);
}
Object indexes = indexFileObject.get("datastore-indexes");
if (indexes instanceof JSONObject) { if (indexes instanceof JSONObject) {
datastoreIndexes = (JSONObject) indexes; datastoreIndexes = (JSONObject) indexes;
} }