From 48bac0abd2f7fcc5cbed5d48038f7e4307401eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav@github.com>
Date: Wed, 29 Sep 2021 13:54:04 +0200
Subject: [PATCH] Fix race in codespaces delete test

---
 cmd/ghcs/delete_test.go | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/cmd/ghcs/delete_test.go b/cmd/ghcs/delete_test.go
index b581fdadd..af30bc542 100644
--- a/cmd/ghcs/delete_test.go
+++ b/cmd/ghcs/delete_test.go
@@ -6,9 +6,11 @@ import (
 	"errors"
 	"fmt"
 	"sort"
+	"strings"
 	"testing"
 	"time"
 
+	"github.com/MakeNowJust/heredoc"
 	"github.com/cli/cli/v2/cmd/ghcs/output"
 	"github.com/cli/cli/v2/internal/api"
 )
@@ -102,7 +104,10 @@ func TestDelete(t *testing.T) {
 			deleteErr:   errors.New("aborted by test"),
 			wantErr:     true,
 			wantDeleted: []string{"hubot-robawt-abc", "monalisa-spoonknife-123"},
-			wantStderr:  "error deleting codespace \"hubot-robawt-abc\": aborted by test\nerror deleting codespace \"monalisa-spoonknife-123\": aborted by test\n",
+			wantStderr: heredoc.Doc(`
+				error deleting codespace "hubot-robawt-abc": aborted by test
+				error deleting codespace "monalisa-spoonknife-123": aborted by test
+			`),
 		},
 		{
 			name: "with confirm",
@@ -221,7 +226,7 @@ func TestDelete(t *testing.T) {
 			if out := stdout.String(); out != tt.wantStdout {
 				t.Errorf("stdout = %q, want %q", out, tt.wantStdout)
 			}
-			if out := stderr.String(); out != tt.wantStderr {
+			if out := sortLines(stderr.String()); out != tt.wantStderr {
 				t.Errorf("stderr = %q, want %q", out, tt.wantStderr)
 			}
 		})
@@ -239,3 +244,14 @@ func sliceEquals(a, b []string) bool {
 	}
 	return true
 }
+
+func sortLines(s string) string {
+	trailing := ""
+	if strings.HasSuffix(s, "\n") {
+		s = strings.TrimSuffix(s, "\n")
+		trailing = "\n"
+	}
+	lines := strings.Split(s, "\n")
+	sort.Strings(lines)
+	return strings.Join(lines, "\n") + trailing
+}