From dab4ad4c383f6f6ed76aeca98ca19aa3b93d6872 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Fri, 13 Dec 2024 15:59:02 +0000
Subject: [PATCH] Fix java restart server tests to wait long enough

---
 ycmd/tests/java/__init__.py               |  4 ++++
 ycmd/tests/java/server_management_test.py | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ycmd/tests/java/__init__.py b/ycmd/tests/java/__init__.py
index 5bdfc2df..09b9bff3 100644
--- a/ycmd/tests/java/__init__.py
+++ b/ycmd/tests/java/__init__.py
@@ -62,6 +62,10 @@ def StartJavaCompleterServerWithFile( app, file_path ):
                    event_name = 'FileReadyToParse',
                    filepath = file_path,
                    filetype = 'java' ) )
+  WaitUntilJavaCompleterServerReady( app )
+
+
+def WaitUntilJavaCompleterServerReady( app ):
   WaitUntilCompleterServerReady( app, 'java', SERVER_STARTUP_TIMEOUT )
 
 
diff --git a/ycmd/tests/java/server_management_test.py b/ycmd/tests/java/server_management_test.py
index 87700424..9cc871dd 100644
--- a/ycmd/tests/java/server_management_test.py
+++ b/ycmd/tests/java/server_management_test.py
@@ -36,15 +36,15 @@ from ycmd.tests.java import ( PathToTestFile,
                               isolated_app,
                               IsolatedYcmd,
                               StartJavaCompleterServerInDirectory,
-                              StartJavaCompleterServerWithFile )
+                              StartJavaCompleterServerWithFile,
+                              WaitUntilJavaCompleterServerReady )
 from ycmd.tests.test_utils import ( BuildRequest,
                                     CompleterProjectDirectoryMatcher,
                                     LocationMatcher,
                                     MockProcessTerminationTimingOut,
                                     RangeMatcher,
                                     TemporaryTestDir,
-                                    WaitForDiagnosticsToBeReady,
-                                    WaitUntilCompleterServerReady )
+                                    WaitForDiagnosticsToBeReady )
 from ycmd import utils, handlers
 
 
@@ -104,7 +104,7 @@ class ServerManagementTest( TestCase ):
       ),
     )
 
-    WaitUntilCompleterServerReady( app, 'java' )
+    WaitUntilJavaCompleterServerReady( app )
 
     app.post_json(
       '/event_notification',
@@ -147,7 +147,7 @@ class ServerManagementTest( TestCase ):
           ),
         )
 
-        WaitUntilCompleterServerReady( app, 'java' )
+        WaitUntilJavaCompleterServerReady( app )
 
         assert_that(
           app.post_json( '/debug_info',
@@ -197,7 +197,7 @@ class ServerManagementTest( TestCase ):
           ),
         )
 
-        WaitUntilCompleterServerReady( app, 'java' )
+        WaitUntilJavaCompleterServerReady( app )
 
         assert_that(
           app.post_json( '/debug_info',
-- 
2.45.2