Skip to content

Commit cf6878d

Browse files
rohit-nayak-psmhamza15
authored andcommitted
VStreamer Unit Tests: framework to remove the need to specify serialized strings in row events for unit tests (vitessio#14903)
Signed-off-by: Rohit Nayak <[email protected]>
1 parent a0d4776 commit cf6878d

File tree

8 files changed

+861
-405
lines changed

8 files changed

+861
-405
lines changed

go/cmd/vtadmin/main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,6 @@ func main() {
221221
if err := rootCmd.Execute(); err != nil {
222222
log.Fatal(err)
223223
}
224-
225-
log.Flush()
226224
}
227225

228226
type noopCloser struct{}

go/vt/vtgate/executor.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,12 @@ import (
3030

3131
"github.com/spf13/pflag"
3232

33-
"vitess.io/vitess/go/cache/theine"
34-
"vitess.io/vitess/go/streamlog"
35-
"vitess.io/vitess/go/vt/vtenv"
36-
"vitess.io/vitess/go/vt/vthash"
37-
3833
"vitess.io/vitess/go/acl"
34+
"vitess.io/vitess/go/cache/theine"
3935
"vitess.io/vitess/go/mysql/collations"
4036
"vitess.io/vitess/go/sqltypes"
4137
"vitess.io/vitess/go/stats"
38+
"vitess.io/vitess/go/streamlog"
4239
"vitess.io/vitess/go/trace"
4340
"vitess.io/vitess/go/vt/callerid"
4441
"vitess.io/vitess/go/vt/key"
@@ -53,6 +50,7 @@ import (
5350
"vitess.io/vitess/go/vt/srvtopo"
5451
"vitess.io/vitess/go/vt/sysvars"
5552
"vitess.io/vitess/go/vt/topo/topoproto"
53+
"vitess.io/vitess/go/vt/vtenv"
5654
"vitess.io/vitess/go/vt/vterrors"
5755
"vitess.io/vitess/go/vt/vtgate/engine"
5856
"vitess.io/vitess/go/vt/vtgate/evalengine"
@@ -62,6 +60,7 @@ import (
6260
"vitess.io/vitess/go/vt/vtgate/vindexes"
6361
"vitess.io/vitess/go/vt/vtgate/vschemaacl"
6462
"vitess.io/vitess/go/vt/vtgate/vtgateservice"
63+
"vitess.io/vitess/go/vt/vthash"
6564
)
6665

6766
var (

go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ func TestPlayerInvisibleColumns(t *testing.T) {
186186
output := qh.Expect(tcases.output)
187187
expectNontxQueries(t, output)
188188
time.Sleep(1 * time.Second)
189-
log.Flush()
190189
if tcases.table != "" {
191190
expectData(t, tcases.table, tcases.data)
192191
}
@@ -3094,7 +3093,6 @@ func TestPlayerNoBlob(t *testing.T) {
30943093
output := qh.Expect(tcases.output)
30953094
expectNontxQueries(t, output)
30963095
time.Sleep(1 * time.Second)
3097-
log.Flush()
30983096
if tcases.table != "" {
30993097
expectData(t, tcases.table, tcases.data)
31003098
}
@@ -3333,7 +3331,6 @@ func TestPlayerBatchMode(t *testing.T) {
33333331
}
33343332
expectNontxQueries(t, output)
33353333
time.Sleep(1 * time.Second)
3336-
log.Flush()
33373334
if tcase.table != "" {
33383335
expectData(t, tcase.table, tcase.data)
33393336
}

0 commit comments

Comments
 (0)