@@ -41,6 +41,7 @@ import (
41
41
"cdr.dev/slog"
42
42
"cdr.dev/slog/sloggers/slogtest"
43
43
"github.com/coder/coder/agent"
44
+ "github.com/coder/coder/agent/agentssh"
44
45
"github.com/coder/coder/coderd/httpapi"
45
46
"github.com/coder/coder/codersdk"
46
47
"github.com/coder/coder/codersdk/agentsdk"
@@ -131,13 +132,13 @@ func TestAgent_Stats_Magic(t *testing.T) {
131
132
defer sshClient .Close ()
132
133
session , err := sshClient .NewSession ()
133
134
require .NoError (t , err )
134
- session .Setenv (agent . MagicSSHSessionTypeEnvironmentVariable , agent . MagicSSHSessionTypeVSCode )
135
+ session .Setenv (agentssh . MagicSessionTypeEnvironmentVariable , agentssh . MagicSessionTypeVSCode )
135
136
defer session .Close ()
136
137
137
- command := "sh -c 'echo $" + agent . MagicSSHSessionTypeEnvironmentVariable + "'"
138
+ command := "sh -c 'echo $" + agentssh . MagicSessionTypeEnvironmentVariable + "'"
138
139
expected := ""
139
140
if runtime .GOOS == "windows" {
140
- expected = "%" + agent . MagicSSHSessionTypeEnvironmentVariable + "%"
141
+ expected = "%" + agentssh . MagicSessionTypeEnvironmentVariable + "%"
141
142
command = "cmd.exe /c echo " + expected
142
143
}
143
144
output , err := session .Output (command )
@@ -158,7 +159,7 @@ func TestAgent_Stats_Magic(t *testing.T) {
158
159
defer sshClient .Close ()
159
160
session , err := sshClient .NewSession ()
160
161
require .NoError (t , err )
161
- session .Setenv (agent . MagicSSHSessionTypeEnvironmentVariable , agent . MagicSSHSessionTypeVSCode )
162
+ session .Setenv (agentssh . MagicSessionTypeEnvironmentVariable , agentssh . MagicSessionTypeVSCode )
162
163
defer session .Close ()
163
164
stdin , err := session .StdinPipe ()
164
165
require .NoError (t , err )
@@ -1651,7 +1652,7 @@ func setupSSHCommand(t *testing.T, beforeArgs []string, afterArgs []string) *exe
1651
1652
}
1652
1653
waitGroup .Add (1 )
1653
1654
go func () {
1654
- agent .Bicopy (context .Background (), conn , ssh )
1655
+ agentssh .Bicopy (context .Background (), conn , ssh )
1655
1656
waitGroup .Done ()
1656
1657
}()
1657
1658
}
0 commit comments