wip: attemp to fix tests

cmd/integration_test.go

@@ -1026,12 +1026,12 @@ func TestAbortedByScriptAbortInVUCodeInGroup(t *testing.T) {
 
 	t.Run("noLinger", func(t *testing.T) {
 		t.Parallel()
-		testAbortedByScriptTestAbort(t, true, script, runTestWithNoLinger)
+		testAbortedByScriptTestAbort(t, script, runTestWithNoLinger)
 	})
 
 	t.Run("withLinger", func(t *testing.T) {
 		t.Parallel()
-		testAbortedByScriptTestAbort(t, true, script, runTestWithLinger)
+		testAbortedByScriptTestAbort(t, script, runTestWithLinger)
 	})
 }
 
@@ -1110,13 +1110,8 @@ func TestAbortedByInterruptDuringVUInit(t *testing.T) {
 		export default function () {};
 	`
 
-	// TODO: fix this to exect lib.RunStatusAbortedUser and
-	// exitcodes.ExternalAbort
-	//
-	// This is testing the current behavior, which is expected, but it's not
-	// actually the desired one! See https://github.com/grafana/k6/issues/2804
 	ts := getSimpleCloudOutputTestState(
-		t, script, nil, cloudapi.RunStatusAbortedSystem, cloudapi.ResultStatusPassed, exitcodes.GenericEngine,
+		t, script, nil, cloudapi.RunStatusAbortedUser, cloudapi.ResultStatusPassed, exitcodes.ExternalAbort,
 	)
 	asyncWaitForStdoutAndStopTestWithInterruptSignal(t, ts, 15, time.Second, "VU init sleeping for a while")
 	newRootCommand(ts.globalState).execute()