Skip to content

Commit

Permalink
Cherry-pick 0e22a3e with conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vitess-bot[bot] authored and vitess-bot committed Oct 22, 2024
1 parent 4416ff1 commit 23dd6ab
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/vitess_tester_vtgate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@ jobs:
go install github.com/vitessio/go-junit-report@HEAD
# install vitess tester
<<<<<<< HEAD
go install github.com/vitessio/vitess-tester@89dd933a9ea0e15f69ca58b9c8ea09a358762cca
=======
go install github.com/vitessio/vt/go/vt@e43009309f599378504905d4b804460f47822ac5
>>>>>>> 0e22a3e397 (Change the name of the vitess-tester repository (#16917))

- name: Setup launchable dependencies
if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
Expand Down Expand Up @@ -141,7 +145,7 @@ jobs:
i=1
for dir in ./go/test/endtoend/vtgate/vitess_tester/*/; do
# We go over all the directories in the given path.
# If there is a vschema file there, we use it, otherwise we let vitess-tester autogenerate it.
# If there is a vschema file there, we use it, otherwise we let vt tester autogenerate it.
if [ -f $dir/vschema.json ]; then
vitess-tester --xunit --vschema "$dir"vschema.json $dir/*.test
else
Expand Down
2 changes: 1 addition & 1 deletion go/test/endtoend/vtgate/queries/subquery/subquery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func TestSubqueryInDerivedTable(t *testing.T) {
}

func TestSubqueries(t *testing.T) {
// This method tests many types of subqueries. The queries should move to a vitess-tester test file once we have a way to run them.
// This method tests many types of subqueries. The queries should move to a vt tester test file once we have a way to run them.
// The commented out queries are failing because of wrong types being returned.
// The tests are commented out until the issue is fixed.
mcmp, closer := start(t)
Expand Down
6 changes: 5 additions & 1 deletion test/templates/cluster_vitess_tester.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ jobs:
go install github.com/vitessio/go-junit-report@HEAD

# install vitess tester
<<<<<<< HEAD
go install github.com/vitessio/vitess-tester@89dd933a9ea0e15f69ca58b9c8ea09a358762cca
=======
go install github.com/vitessio/vt/go/vt@e43009309f599378504905d4b804460f47822ac5
>>>>>>> 0e22a3e397 (Change the name of the vitess-tester repository (#16917))

- name: Setup launchable dependencies
if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
Expand Down Expand Up @@ -139,7 +143,7 @@ jobs:
i=1
for dir in {{.Path}}/*/; do
# We go over all the directories in the given path.
# If there is a vschema file there, we use it, otherwise we let vitess-tester autogenerate it.
# If there is a vschema file there, we use it, otherwise we let vt tester autogenerate it.
if [ -f $dir/vschema.json ]; then
vitess-tester --xunit --vschema "$dir"vschema.json $dir/*.test
else
Expand Down

0 comments on commit 23dd6ab

Please sign in to comment.