Run Windows guest tests against current agent

Author: sjmiller609

.github/workflows/test.yml

@@ -134,7 +134,7 @@ jobs:
 
       - name: Test Windows guest control
         run: |
-          make build-embedded
+          make build-embedded build-windows-guest-agent
           TEST_PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
           for attempt in 1 2 3; do
             if sudo env \

lib/instances/windows_guest_agent_integration_linux_test.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -76,6 +77,7 @@ func TestWindowsGuestAgentIntegration(t *testing.T) {
 
 	dialer, err := manager.GetVsockDialer(ctx, instance.Id)
 	require.NoError(t, err)
+	upgradeWindowsGuestAgent(t, ctx, dialer)
 
 	var stdout, stderr bytes.Buffer
 	jobStart := time.Now()
@@ -168,14 +170,6 @@ public static class DesktopIdentity {
 	require.Equal(t, 0, exit.Code)
 	assert.Equal(t, `WinSta0\Default`, stdout.String())
 
-	_, err = guest.ExecIntoInstance(ctx, dialer, guest.ExecOptions{
-		Command: []string{"cmd.exe"},
-		TTY:     true,
-		Session: guest.ExecSession_EXEC_SESSION_DESKTOP,
-		Timeout: 30,
-	})
-	assert.ErrorContains(t, err, "desktop ConPTY sessions are not supported")
-
 	source := filepath.Join(t.TempDir(), "roundtrip.txt")
 	require.NoError(t, os.WriteFile(source, []byte("HYPEMAN_COPY_OK"), 0644))
 	require.NoError(t, guest.CopyToInstance(ctx, dialer, guest.CopyToInstanceOptions{
@@ -191,3 +185,40 @@ public static class DesktopIdentity {
 	require.NoError(t, err)
 	assert.Equal(t, "HYPEMAN_COPY_OK", string(contents))
 }
+
+func upgradeWindowsGuestAgent(t *testing.T, ctx context.Context, dialer hypervisor.VsockDialer) {
+	t.Helper()
+
+	source := filepath.Join("..", "system", "guest_agent", "hypeman-guest-agent.exe")
+	require.FileExists(t, source)
+	const destination = `C:\ProgramData\Hypeman\hypeman-guest-agent-current.exe`
+	require.NoError(t, guest.CopyToInstance(ctx, dialer, guest.CopyToInstanceOptions{
+		SrcPath: source,
+		DstPath: destination,
+	}))
+
+	var stderr bytes.Buffer
+	exit, err := guest.ExecIntoInstance(ctx, dialer, guest.ExecOptions{
+		Command: []string{"sc.exe", "config", "HypemanGuestAgent", "binPath=", destination},
+		Stderr:  &stderr,
+		Timeout: 15,
+	})
+	require.NoError(t, err, stderr.String())
+	require.Equal(t, 0, exit.Code, stderr.String())
+
+	const restartScript = `$action = New-ScheduledTaskAction -Execute 'powershell.exe' -Argument '-NoProfile -NonInteractive -Command "Start-Sleep -Milliseconds 500; Restart-Service -Name HypemanGuestAgent -Force"'; Register-ScheduledTask -TaskName HypemanGuestAgentUpgrade -Action $action -User SYSTEM -RunLevel Highest -Force | Out-Null; Start-ScheduledTask -TaskName HypemanGuestAgentUpgrade`
+	_, _ = guest.ExecIntoInstance(ctx, dialer, guest.ExecOptions{
+		Command: []string{"powershell.exe", "-NoProfile", "-NonInteractive", "-Command", restartScript},
+		Timeout: 15,
+	})
+
+	require.Eventually(t, func() bool {
+		_, err := guest.ExecIntoInstance(ctx, dialer, guest.ExecOptions{
+			Command: []string{"cmd.exe", "/d", "/c", "exit", "0"},
+			TTY:     true,
+			Session: guest.ExecSession_EXEC_SESSION_DESKTOP,
+			Timeout: 5,
+		})
+		return err != nil && strings.Contains(err.Error(), "desktop ConPTY sessions are not supported")
+	}, 20*time.Second, 250*time.Millisecond, "updated Windows guest agent did not become ready")
+}