Fix Tests

OpenTSDB · Sep 21, 2016 · 83b067e · 83b067e
1 parent dc19d8e
commit 83b067e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/tsd/RpcManager.java b/src/tsd/RpcManager.java
@@ -273,9 +273,7 @@ private void initializeBuiltinRpcs(final String mode,
       final DropCachesRpc dropcaches = new DropCachesRpc();
       final ListAggregators aggregators = new ListAggregators();
       final SuggestRpc suggest_rpc = new SuggestRpc();
-      if (enableAnnotations) {
-        final AnnotationRpc annotation_rpc = new AnnotationRpc();
-      }
+      final AnnotationRpc annotation_rpc = new AnnotationRpc();
       final Version version = new Version();
 
       telnet.put("stats", stats);

diff --git a/test/tsd/TestRpcManager.java b/test/tsd/TestRpcManager.java
@@ -50,6 +50,8 @@ public void before() {
       .thenReturn("true");
     when(config.getString("tsd.core.enable_ui"))
       .thenReturn("true");
+    when(config.getString("tsd.core.enable_annotations"))
+      .thenReturn("true");
     when(config.getString("tsd.no_diediedie"))
       .thenReturn("false");
     TSDB tsdb = mock(TSDB.class);
@@ -75,8 +77,10 @@ public void loadHttpRpcPlugins() throws Exception {
       .thenReturn("true");
     when(config.getString("tsd.core.enable_ui"))
       .thenReturn("true");
+    when(config.getString("tsd.core.enable_annotations"))
+      .thenReturn("true");
     when(config.getString("tsd.no_diediedie"))
-     .thenReturn("false");
+      .thenReturn("false");
 
     TSDB tsdb = mock(TSDB.class);
     when(tsdb.getConfig()).thenReturn(config);
@@ -105,6 +109,8 @@ public void loadRpcPlugin() throws Exception {
       .thenReturn("true");
     when(config.getString("tsd.core.enable_ui"))
       .thenReturn("true");
+    when(config.getString("tsd.core.enable_annotations"))
+      .thenReturn("true");
     when(config.getString("tsd.no_diediedie"))
       .thenReturn("false");