Merge #15803 fix(lsp_spec): tests depend on previous session

scripts/release.sh

@@ -80,8 +80,8 @@ _do_release_commit() {
 _do_bump_commit() {
   $__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt
   $__sed -i.bk 's/set\((NVIM_VERSION_PATCH) [[:digit:]]/set(\1 ?/' CMakeLists.txt
-  rm CMakeLists.txt.bk
-  rm runtime/nvim.appdata.xml.bk
+  rm -f CMakeLists.txt.bk
+  rm -f runtime/nvim.appdata.xml.bk
   nvim +'/NVIM_VERSION' +1new +'exe "norm! iUpdate version numbers!!!"' \
     -O CMakeLists.txt
 

test/functional/plugin/lsp_spec.lua

@@ -132,9 +132,9 @@ local function test_rpc_server(config)
 end
 
 describe('LSP', function()
-  describe('server_name specified', function()
   before_each(function()
     clear_notrace()
+
     -- Run an instance of nvim on the file which contains our "scripts".
     -- Pass TEST_NAME to pick the script.
     local test_name = "basic_init"
@@ -163,6 +163,7 @@ describe('LSP', function()
    -- exec_lua("lsp.stop_all_clients(true)")
   end)
 
+  describe('server_name specified', function()
     it('start_client(), stop_client()', function()
       retry(nil, 4000, function()
         eq(1, exec_lua('return #lsp.get_active_clients()'))
@@ -334,7 +335,6 @@ describe('LSP', function()
       }
     end)
     it('workspace/configuration returns NIL per section if client was started without config.settings', function()
-      clear_notrace()
       fake_lsp_server_setup('workspace/configuration no settings')
       eq({ NIL, NIL, }, exec_lua [[
         local result = {