Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit58ee327

Browse files
committed
try to fix test on Win
1 parentfddefbd commit58ee327

File tree

1 file changed

+32
-6
lines changed

1 file changed

+32
-6
lines changed

‎agent/agentscripts/agentscripts_test.go

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package agentscripts_test
33
import (
44
"context"
55
"path/filepath"
6+
"runtime"
67
"testing"
78
"time"
89

@@ -17,6 +18,7 @@ import (
1718
"github.com/coder/coder/v2/agent/agentssh"
1819
"github.com/coder/coder/v2/codersdk"
1920
"github.com/coder/coder/v2/codersdk/agentsdk"
21+
"github.com/coder/coder/v2/testutil"
2022
)
2123

2224
funcTestMain(m*testing.M) {
@@ -48,7 +50,7 @@ func TestExecuteBasic(t *testing.T) {
4850

4951
funcTestEnv(t*testing.T) {
5052
t.Parallel()
51-
logs:=make(chan agentsdk.PatchLogs,1)
53+
logs:=make(chan agentsdk.PatchLogs,2)
5254
runner:=setup(t,func(ctx context.Context,req agentsdk.PatchLogs)error {
5355
select {
5456
case<-ctx.Done():
@@ -58,17 +60,41 @@ func TestEnv(t *testing.T) {
5860
})
5961
deferrunner.Close()
6062
id:=uuid.New()
63+
script:="echo $CODER_SCRIPT_DATA_DIR\necho $CODER_SCRIPT_BIN_DIR\n"
64+
ifruntime.GOOS=="windows" {
65+
script=`
66+
cmd.exe /c echo %CODER_SCRIPT_DATA_DIR%
67+
cmd.exe /c echo %CODER_SCRIPT_BIN_DIR%
68+
`
69+
}
6170
err:=runner.Init([]codersdk.WorkspaceAgentScript{{
6271
LogSourceID:id,
63-
Script:"echo $CODER_SCRIPT_DATA_DIR\necho $CODER_SCRIPT_BIN_DIR\n",
72+
Script:script,
6473
}})
6574
require.NoError(t,err)
66-
require.NoError(t,runner.Execute(context.Background(),func(script codersdk.WorkspaceAgentScript)bool {
75+
76+
ctx:=testutil.Context(t,testutil.WaitLong)
77+
78+
require.NoError(t,runner.Execute(ctx,func(script codersdk.WorkspaceAgentScript)bool {
6779
returntrue
6880
}))
69-
log:=<-logs
70-
require.Contains(t,log.Logs[0].Output,filepath.Join(runner.DataDir(),id.String()))
71-
require.Contains(t,log.Logs[1].Output,runner.ScriptBinDir())
81+
varlog []agentsdk.Log
82+
for {
83+
select {
84+
case<-ctx.Done():
85+
require.Fail(t,"timed out waiting for logs")
86+
casel:=<-logs:
87+
for_,l:=rangel.Logs {
88+
t.Logf("log: %s",l.Output)
89+
}
90+
log=append(log,l.Logs...)
91+
}
92+
iflen(log)>=2 {
93+
break
94+
}
95+
}
96+
require.Contains(t,log[0].Output,filepath.Join(runner.DataDir(),id.String()))
97+
require.Contains(t,log[1].Output,runner.ScriptBinDir())
7298
}
7399

74100
funcTestTimeout(t*testing.T) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp