From c13043e2ff0061e7863325b1eae74d6448221403 Mon Sep 17 00:00:00 2001 From: Andy Jordan <2226434+andyleejordan@users.noreply.github.com> Date: Wed, 8 Apr 2026 13:03:26 -0700 Subject: [PATCH 1/3] One more round of package updates --- Directory.Packages.props | 12 ++++++------ .../PowerShellEditorServices.Test.csproj | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 52dfbdc8b..c76c2a7e3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,12 +1,12 @@ - - - - + + + + - + @@ -29,7 +29,7 @@ - + diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj index 6cd7ae849..838520efd 100644 --- a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj +++ b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj @@ -18,7 +18,7 @@ - + From 30a35f827ac227b3d6b13aa595d3336f5e87e859 Mon Sep 17 00:00:00 2001 From: Andy Jordan <2226434+andyleejordan@users.noreply.github.com> Date: Wed, 8 Apr 2026 13:14:51 -0700 Subject: [PATCH 2/3] Update test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../PowerShellEditorServices.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj index 838520efd..6161a113e 100644 --- a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj +++ b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj @@ -18,7 +18,7 @@ - + From 9455abe228b04f1f6b2121733114a8ce6cdb4a38 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Apr 2026 13:26:57 -0700 Subject: [PATCH 3/3] Fix flaky Emacs e2e test: replace fixed sleep with diagnostic polling loop (#2276) * Initial plan * Fix timing issue in Emacs test by polling for flymake diagnostics Agent-Logs-Url: https://github.com/PowerShell/PowerShellEditorServices/sessions/19f2e25d-3a5e-4570-97bf-ce36493b9795 Co-authored-by: andyleejordan <2226434+andyleejordan@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: andyleejordan <2226434+andyleejordan@users.noreply.github.com> --- test/emacs-test.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/emacs-test.el b/test/emacs-test.el index 378c792fc..f085881c2 100644 --- a/test/emacs-test.el +++ b/test/emacs-test.el @@ -61,8 +61,12 @@ (let ((lsp (eglot-current-server))) (should (string= (eglot--project-nickname lsp) "PowerShellEditorServices")) (should (member (cons 'powershell-mode "powershell") (eglot--languages lsp)))) - (sleep-for 5) ; TODO: Wait for "textDocument/publishDiagnostics" instead (flymake-start) + ;; Wait for diagnostics to arrive instead of sleeping a fixed duration + (let ((deadline (time-add (current-time) 30))) + (while (and (time-less-p (current-time) deadline) + (null (flymake-diagnostics))) + (sleep-for 0.5))) (goto-char (point-min)) (flymake-goto-next-error) (should (eq 'flymake-warning (face-at-point))))))