Merge remote-tracking branch 'upstream/master' into mavenize

ahornace · ahornace · commit 6d5300ac8534 · 2018-07-31T11:19:45.000+02:00
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchEngineTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchEngineTest.java
@@ -165,6 +165,7 @@ public void testGetQuery() throws Exception {
                 instance.getQuery());
     }
 
+    /* see https://github.com/oracle/opengrok/issues/2030
     @Test
     public void testSearch() {
         List<Hit> hits = new ArrayList<>();
@@ -292,4 +293,5 @@ public void testSearch() {
         assertEquals(1, instance.search());
         instance.destroy();
     }
+    */
 }

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ public void testGetQuery() throws Exception {`
`165`	`165`	`instance.getQuery());`
`166`	`166`	`}`
`167`	`167`
	`168`	`+ /* see https://github.com/oracle/opengrok/issues/2030`
`168`	`169`	`@Test`
`169`	`170`	`public void testSearch() {`
`170`	`171`	`List<Hit> hits = new ArrayList<>();`
`@@ -292,4 +293,5 @@ public void testSearch() {`
`292`	`293`	`assertEquals(1, instance.search());`
`293`	`294`	`instance.destroy();`
`294`	`295`	`}`
	`296`	`+ */`
`295`	`297`	`}`