Skip to content

Commit c0fac6b

Browse files
committed
Fix log tests
1 parent 9a38131 commit c0fac6b

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

codersdk/agentsdk/logs_test.go

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,10 @@ func TestStartupLogsWriter_Write(t *testing.T) {
5656
{
5757
Level: codersdk.LogLevelInfo,
5858
Output: "hello world",
59-
Source: codersdk.WorkspaceAgentLogSourceExternal,
6059
},
6160
{
6261
Level: codersdk.LogLevelInfo,
6362
Output: "goodbye world",
64-
Source: codersdk.WorkspaceAgentLogSourceExternal,
6563
},
6664
},
6765
},
@@ -74,32 +72,26 @@ func TestStartupLogsWriter_Write(t *testing.T) {
7472
{
7573
Level: codersdk.LogLevelInfo,
7674
Output: "",
77-
Source: codersdk.WorkspaceAgentLogSourceExternal,
7875
},
7976
{
8077
Level: codersdk.LogLevelInfo,
8178
Output: "",
82-
Source: codersdk.WorkspaceAgentLogSourceExternal,
8379
},
8480
{
8581
Level: codersdk.LogLevelInfo,
8682
Output: "hello world",
87-
Source: codersdk.WorkspaceAgentLogSourceExternal,
8883
},
8984
{
9085
Level: codersdk.LogLevelInfo,
9186
Output: "",
92-
Source: codersdk.WorkspaceAgentLogSourceExternal,
9387
},
9488
{
9589
Level: codersdk.LogLevelInfo,
9690
Output: "",
97-
Source: codersdk.WorkspaceAgentLogSourceExternal,
9891
},
9992
{
10093
Level: codersdk.LogLevelInfo,
10194
Output: "goodbye world",
102-
Source: codersdk.WorkspaceAgentLogSourceExternal,
10395
},
10496
},
10597
},
@@ -112,7 +104,6 @@ func TestStartupLogsWriter_Write(t *testing.T) {
112104
{
113105
Level: codersdk.LogLevelInfo,
114106
Output: "hello world",
115-
Source: codersdk.WorkspaceAgentLogSourceExternal,
116107
},
117108
},
118109
},
@@ -126,12 +117,10 @@ func TestStartupLogsWriter_Write(t *testing.T) {
126117
{
127118
Level: codersdk.LogLevelInfo,
128119
Output: "hello world",
129-
Source: codersdk.WorkspaceAgentLogSourceExternal,
130120
},
131121
{
132122
Level: codersdk.LogLevelInfo,
133123
Output: "goodbye world",
134-
Source: codersdk.WorkspaceAgentLogSourceExternal,
135124
},
136125
},
137126
},
@@ -144,12 +133,10 @@ func TestStartupLogsWriter_Write(t *testing.T) {
144133
{
145134
Level: codersdk.LogLevelInfo,
146135
Output: "hello world",
147-
Source: codersdk.WorkspaceAgentLogSourceExternal,
148136
},
149137
{
150138
Level: codersdk.LogLevelInfo,
151139
Output: "goodbye world",
152-
Source: codersdk.WorkspaceAgentLogSourceExternal,
153140
},
154141
},
155142
},
@@ -162,17 +149,14 @@ func TestStartupLogsWriter_Write(t *testing.T) {
162149
{
163150
Level: codersdk.LogLevelInfo,
164151
Output: "hello world",
165-
Source: codersdk.WorkspaceAgentLogSourceExternal,
166152
},
167153
{
168154
Level: codersdk.LogLevelInfo,
169155
Output: "\r",
170-
Source: codersdk.WorkspaceAgentLogSourceExternal,
171156
},
172157
{
173158
Level: codersdk.LogLevelInfo,
174159
Output: "goodbye world",
175-
Source: codersdk.WorkspaceAgentLogSourceExternal,
176160
},
177161
},
178162
},
@@ -200,7 +184,7 @@ func TestStartupLogsWriter_Write(t *testing.T) {
200184
got = append(got, log...)
201185
return nil
202186
}
203-
w := agentsdk.StartupLogsWriter(tt.ctx, send, tt.source, tt.level)
187+
w := agentsdk.StartupLogsWriter(tt.ctx, send, uuid.New(), tt.level)
204188
for _, s := range tt.writes {
205189
_, err := w.Write([]byte(s))
206190
if err != nil {
@@ -290,7 +274,7 @@ func TestStartupLogsSender(t *testing.T) {
290274
return nil
291275
}
292276

293-
sendLog, flushAndClose := agentsdk.LogsSender(patchLogs, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
277+
sendLog, flushAndClose := agentsdk.LogsSender(uuid.New(), patchLogs, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
294278
defer func() {
295279
err := flushAndClose(ctx)
296280
require.NoError(t, err)
@@ -360,7 +344,7 @@ func TestStartupLogsSender(t *testing.T) {
360344
return nil
361345
}
362346

363-
sendLog, flushAndClose := agentsdk.LogsSender(patchLogs, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
347+
sendLog, flushAndClose := agentsdk.LogsSender(uuid.New(), patchLogs, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
364348
defer func() {
365349
_ = flushAndClose(ctx)
366350
}()

0 commit comments

Comments
 (0)