Skip to content

Commit a8d535a

Browse files
committed
test: use tee reader to show log output while scanning it
Signed-off-by: Russell Centanni <[email protected]>
1 parent 110801c commit a8d535a

File tree

1 file changed

+25
-15
lines changed

1 file changed

+25
-15
lines changed

e2e/tests/restarthelper/restarthelper.go

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ package restarthelper
33
import (
44
"bufio"
55
"context"
6+
"io"
7+
"os"
8+
"strings"
9+
"time"
10+
611
"github.com/loft-sh/devspace/cmd"
712
"github.com/loft-sh/devspace/cmd/flags"
813
"github.com/loft-sh/devspace/e2e/framework"
@@ -13,9 +18,6 @@ import (
1318
"github.com/onsi/ginkgo/v2"
1419
"github.com/onsi/gomega"
1520
"github.com/sirupsen/logrus"
16-
"os"
17-
"strings"
18-
"time"
1921
)
2022

2123
var _ = DevSpaceDescribe("restarthelper", func() {
@@ -55,6 +57,10 @@ var _ = DevSpaceDescribe("restarthelper", func() {
5557
reader, writer, err := os.Pipe()
5658
framework.ExpectNoError(err)
5759

60+
teeReader := io.TeeReader(reader, os.Stdout)
61+
scanner := bufio.NewScanner(teeReader)
62+
scanner.Split(scanner2.ScanLines)
63+
5864
//output := &bytes.Buffer{}
5965
log := logpkg.NewStreamLogger(writer, writer, logrus.DebugLevel)
6066

@@ -63,6 +69,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
6369
GlobalFlags: &flags.GlobalFlags{
6470
NoWarn: true,
6571
Namespace: ns,
72+
Debug: true,
6673
},
6774
Pipeline: "dev",
6875
SkipPush: true,
@@ -76,9 +83,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
7683
done <- err
7784
}()
7885

79-
scanner := bufio.NewScanner(reader)
80-
scanner.Split(scanner2.ScanLines)
81-
8286
waitSeen := false
8387
waitCount := 0
8488
waitMax := 3
@@ -138,6 +142,10 @@ var _ = DevSpaceDescribe("restarthelper", func() {
138142
reader, writer, err := os.Pipe()
139143
framework.ExpectNoError(err)
140144

145+
teeReader := io.TeeReader(reader, os.Stdout)
146+
scanner := bufio.NewScanner(teeReader)
147+
scanner.Split(scanner2.ScanLines)
148+
141149
//output := &bytes.Buffer{}
142150
log := logpkg.NewStreamLogger(writer, writer, logrus.DebugLevel)
143151

@@ -146,6 +154,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
146154
GlobalFlags: &flags.GlobalFlags{
147155
NoWarn: true,
148156
Namespace: ns,
157+
Debug: true,
149158
},
150159
Pipeline: "dev",
151160
SkipPush: true,
@@ -159,9 +168,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
159168
done <- err
160169
}()
161170

162-
scanner := bufio.NewScanner(reader)
163-
scanner.Split(scanner2.ScanLines)
164-
165171
waitSeen := false
166172
waitCount := 0
167173
waitMax := 3
@@ -221,6 +227,10 @@ var _ = DevSpaceDescribe("restarthelper", func() {
221227
reader, writer, err := os.Pipe()
222228
framework.ExpectNoError(err)
223229

230+
teeReader := io.TeeReader(reader, os.Stdout)
231+
scanner := bufio.NewScanner(teeReader)
232+
scanner.Split(scanner2.ScanLines)
233+
224234
//output := &bytes.Buffer{}
225235
log := logpkg.NewStreamLogger(writer, writer, logrus.DebugLevel)
226236

@@ -229,6 +239,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
229239
GlobalFlags: &flags.GlobalFlags{
230240
NoWarn: true,
231241
Namespace: ns,
242+
Debug: true,
232243
},
233244
Pipeline: "dev",
234245
SkipPush: true,
@@ -242,9 +253,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
242253
done <- err
243254
}()
244255

245-
scanner := bufio.NewScanner(reader)
246-
scanner.Split(scanner2.ScanLines)
247-
248256
waitSeen := false
249257
waitCount := 0
250258
waitMax := 3
@@ -313,6 +321,10 @@ var _ = DevSpaceDescribe("restarthelper", func() {
313321
reader, writer, err := os.Pipe()
314322
framework.ExpectNoError(err)
315323

324+
teeReader := io.TeeReader(reader, os.Stdout)
325+
scanner := bufio.NewScanner(teeReader)
326+
scanner.Split(scanner2.ScanLines)
327+
316328
//output := &bytes.Buffer{}
317329
log := logpkg.NewStreamLogger(writer, writer, logrus.DebugLevel)
318330

@@ -321,6 +333,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
321333
GlobalFlags: &flags.GlobalFlags{
322334
NoWarn: true,
323335
Namespace: ns,
336+
Debug: true,
324337
},
325338
Pipeline: "dev",
326339
SkipPush: true,
@@ -334,9 +347,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
334347
done <- err
335348
}()
336349

337-
scanner := bufio.NewScanner(reader)
338-
scanner.Split(scanner2.ScanLines)
339-
340350
waitSeen := false
341351
waitCount := 0
342352
waitMax := 3

0 commit comments

Comments
 (0)