Attempt to fix C# tests

Author: bstaletic

build.py

@@ -905,50 +905,43 @@ def GetCsCompleterDataForPlatform():
     'win32': {
       'version': 'v1.39.12',
       'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release'
-                        's/download/v1.39.12/omnisharp-win-x86.zip' ),
-      'file_name': 'omnisharp-win-x86.zip',
-      'check_sum': ( '05ffec8d8b72831f9dab73bcaef373e35115ef5a68951c78283cedc5'
-                     'fb578ddf' ),
+                        's/download/v1.39.12/omnisharp-win-x86-net6.0.zip' ),
+      'file_name': 'omnisharp-win-x86-net6.0.zip',
+      'check_sum': ( 'b38cfc810bbab7f922130d2c8df266454b7be038ef73d278ae082073'
+                     '58318eec' ),
     },
     'win64': {
       'version': 'v1.39.12',
       'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release'
-                        's/download/v1.39.12/omnisharp-win-x64.zip' ),
-      'file_name': 'omnisharp-win-x64.zip',
-      'check_sum': ( 'a52562b44c9baa2811f0a617f182a5886bb79bb1532850827d89f173'
-                     'd8c962b6' ),
+                        's/download/v1.39.12/omnisharp-win-x64-net6.0.zip' ),
+      'file_name': 'omnisharp-win-x64-net6.0.zip',
+      'check_sum': ( '21bb3f7d990b6d464a748e9c11731582caeeaab87d7f749edeacfe13'
+                     '6a09c13e' ),
     },
     'macos': {
       'version': 'v1.39.12',
       'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release'
-                        's/download/v1.39.12/omnisharp-osx.tar.gz' ),
-      'file_name': 'omnisharp-osx.tar.gz',
-      'check_sum': ( '663807abcaa8524b7853803df12e02415376c73bcc93a76eb95d6361'
-                     'aa5aa59a' ),
-    },
-    'linux32': {
-      'version': 'v1.39.12',
-      'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release'
-                        's/download/v1.39.12/omnisharp-linux-x86.tar.gz' ),
-      'file_name': 'omnisharp-linux-x86.tar.gz',
-      'check_sum': ( 'd8f58e1f4e2ec68c19674b1d1ca377ee5acc19960802078a93c12919'
-                     '1aafc57a' ),
+                        's/download/v1.39.12/omnisharp-osx-arm64-net6.0.tar.gz'
+                        '' ),
+      'file_name': 'omnisharp-osx-arm64-net6.0.tar.gz',
+      'check_sum': ( '27db0ded7bf9b1c90155e01a762ea3a39c7da5c26716211bb367886c'
+                     'e27b5ac2' ),
     },
     'linux64': {
       'version': 'v1.39.12',
       'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release'
-                        's/download/v1.39.12/omnisharp-linux-x64.tar.gz' ),
-      'file_name': 'omnisharp-linux-x64.tar.gz',
-      'check_sum': ( '759b45d4814c052d6dc4f43dbc779f6252dc5c1453556768369ee1fc'
-                     'dc6d79f5' ),
+                        's/download/v1.39.12/omnisharp-linux-x64-net6.0.tar.gz'
+                        '' ),
+      'file_name': 'omnisharp-linux-x64-net6.0.tar.gz',
+      'check_sum': ( 'e6496db73f44005b6c750d5f2da7d752edd181cde7e07062944da816'
+                     '95428f65' ),
     },
   }
   if OnWindows():
     return DATA[ 'win64' if IS_64BIT else 'win32' ]
-  else:
-    if OnMac():
-      return DATA[ 'macos' ]
-    return DATA[ 'linux64' if IS_64BIT else 'linux32' ]
+  if OnMac():
+    return DATA[ 'macos' ]
+  return DATA[ 'linux64' ]
 
 
 def EnableGoCompleter( args ):

update_omnisharp.py

@@ -23,11 +23,10 @@
                "releases/{version}/{file_name}" ),
 }
 FILE_NAME = {
-    'win32': 'omnisharp-win-x86.zip',
-    'win64': 'omnisharp-win-x64.zip',
-    'macos': 'omnisharp-osx.tar.gz',
-  'linux32': 'omnisharp-linux-x86.tar.gz',
-  'linux64': 'omnisharp-linux-x64.tar.gz',
+    'win32': 'omnisharp-win-x86-net6.0.zip',
+    'win64': 'omnisharp-win-x64-net6.0.zip',
+    'macos': 'omnisharp-osx-arm64-net6.0.tar.gz',
+  'linux64': 'omnisharp-linux-x64-net6.0.tar.gz',
 }
 
 

ycmd/completers/cs/cs_completer.py

@@ -29,13 +29,12 @@
   os.path.abspath( os.path.dirname( __file__ ) ),
   '..', '..', '..', 'third_party', 'omnisharp-roslyn'
 )
-PATH_TO_OMNISHARP_ROSLYN_BINARY = os.path.join(
-  PATH_TO_ROSLYN_OMNISHARP, 'Omnisharp.exe' )
-if ( not os.path.isfile( PATH_TO_OMNISHARP_ROSLYN_BINARY )
-     and os.path.isfile( os.path.join(
-       PATH_TO_ROSLYN_OMNISHARP, 'omnisharp', 'OmniSharp.exe' ) ) ):
-  PATH_TO_OMNISHARP_ROSLYN_BINARY = (
-    os.path.join( PATH_TO_ROSLYN_OMNISHARP, 'omnisharp', 'OmniSharp.exe' ) )
+if utils.OnWindows():
+  PATH_TO_OMNISHARP_ROSLYN_BINARY = os.path.join(
+    PATH_TO_ROSLYN_OMNISHARP, 'OmniSharp.exe' )
+else:
+  PATH_TO_OMNISHARP_ROSLYN_BINARY = os.path.join(
+    PATH_TO_ROSLYN_OMNISHARP, 'OmniSharp' )
 
 
 def MonoRequired( roslyn_path: str ):

ycmd/tests/cs/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 ycmd contributors
+# Copyright (C) 2024 ycmd contributors
 #
 # This file is part of ycmd.
 #
@@ -17,37 +17,36 @@
 
 import functools
 import os
-import sys
-import time
-from contextlib import contextmanager
 from ycmd.tests.test_utils import ( BuildRequest,
                                     ClearCompletionsCache,
                                     IgnoreExtraConfOutsideTestsFolder,
                                     IsolatedApp,
-                                    WaitUntilCompleterServerReady,
+                                    SetUpApp,
                                     StopCompleterServer,
-                                    SetUpApp )
+                                    WaitUntilCompleterServerReady ) # noqa
 
 shared_app = None
-# map of 'app' to filepaths
-shared_filepaths = {}
-shared_log_indexes = {}
-
-
-def PathToTestFile( *args ):
-  dir_of_current_script = os.path.dirname( os.path.abspath( __file__ ) )
-  return os.path.join( dir_of_current_script, 'testdata', *args )
 
 
 def setUpModule():
   global shared_app
   shared_app = SetUpApp()
+  with IgnoreExtraConfOutsideTestsFolder():
+    StartCsCompleterServerInDirectory( shared_app, PathToTestFile() )
 
 
 def tearDownModule():
-  global shared_app, shared_filepaths
-  for filepath in shared_filepaths.get( shared_app, [] ):
-    StopCompleterServer( shared_app, 'cs', filepath )
+  global shared_app
+  StopCompleterServer( shared_app, 'cs' )
+
+
+def StartCsCompleterServerInDirectory( app, directory ):
+  app.post_json( '/event_notification',
+                 BuildRequest(
+                   filepath = os.path.join( directory, 'Empty.cs' ),
+                   event_name = 'FileReadyToParse',
+                   filetype = 'cs' ) )
+  WaitUntilCompleterServerReady( app, 'cs' )
 
 
 def SharedYcmd( test ):
@@ -69,81 +68,11 @@ def Wrapper( test_case_instance, *args, **kwargs ):
         try:
           test( test_case_instance, app, *args, **kwargs )
         finally:
-          global shared_filepaths
-          for filepath in shared_filepaths.get( app, [] ):
-            StopCompleterServer( app, 'cs', filepath )
+          StopCompleterServer( app, 'cs' )
     return Wrapper
   return Decorator
 
 
-def GetDebugInfo( app, filepath ):
-  request_data = BuildRequest( filetype = 'cs', filepath = filepath )
-  return app.post_json( '/debug_info', request_data ).json
-
-
-def ReadFile( filepath, fileposition ):
-  with open( filepath, encoding = 'utf8' ) as f:
-    if fileposition:
-      f.seek( fileposition )
-    return f.read(), f.tell()
-
-
-def GetDiagnostics( app, filepath ):
-  contents, _ = ReadFile( filepath, 0 )
-
-  event_data = BuildRequest( filepath = filepath,
-                             event_name = 'FileReadyToParse',
-                             filetype = 'cs',
-                             contents = contents )
-
-  return app.post_json( '/event_notification', event_data ).json
-
-
-@contextmanager
-def WrapOmniSharpServer( app, filepath ):
-  global shared_filepaths
-  global shared_log_indexes
-
-  if filepath not in shared_filepaths.setdefault( app, [] ):
-    GetDiagnostics( app, filepath )
-    shared_filepaths[ app ].append( filepath )
-    WaitUntilCsCompleterIsReady( app, filepath )
-
-  logfiles = []
-  response = GetDebugInfo( app, filepath )
-  for server in response[ 'completer' ][ 'servers' ]:
-    logfiles.extend( server[ 'logfiles' ] )
-
-  try:
-    yield
-  finally:
-    for logfile in logfiles:
-      if os.path.isfile( logfile ):
-        log_content, log_end_position = ReadFile(
-            logfile, shared_log_indexes.get( logfile, 0 ) )
-        shared_log_indexes[ logfile ] = log_end_position
-        sys.stdout.write( f'Logfile { logfile }:\n\n' )
-        sys.stdout.write( log_content )
-        sys.stdout.write( '\n' )
-
-
-def WaitUntilCsCompleterIsReady( app, filepath ):
-  WaitUntilCompleterServerReady( app, 'cs' )
-  # Omnisharp isn't ready when it says it is, so wait until Omnisharp returns
-  # at least one diagnostic multiple times.
-  success_count = 0
-  for reraise_error in [ False ] * 39 + [ True ]:
-    try:
-      if len( GetDiagnostics( app, filepath ) ) == 0:
-        raise RuntimeError( "No diagnostic" )
-      success_count += 1
-      if success_count > 2:
-        break
-    except Exception:
-      success_count = 0
-      if reraise_error:
-        raise
-
-    time.sleep( .5 )
-  else:
-    raise RuntimeError( "Never was ready" )
+def PathToTestFile( *args ):
+  dir_of_current_script = os.path.dirname( os.path.abspath( __file__ ) )
+  return os.path.join( dir_of_current_script, 'testdata', *args )