Add mongo-core-test (#1206)

Author: chilagrow

.github/workflows/dance.yml

@@ -43,20 +43,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        config:
-          - dotnet-example
-          - java-example
-          - nodejs-example
-          - python-example
-
-          - mongo-tools
-
-          - ycsb-workloada
-          - ycsb-workloada2
-          - ycsb-workloadb
-          - ycsb-workloadb2
-          - ycsb-workloadc
-          - ycsb-workloadc2
+        include:
+          - { config: dotnet-example }
+          - { config: java-example }
+          - { config: nodejs-example }
+          - { config: python-example }
+
+          - { config: mongo-tools }
+          - { config: mongo-core-test, verbose: true } # verbose to view test output on CI
+
+          - { config: ycsb-workloada }
+          - { config: ycsb-workloada2 }
+          - { config: ycsb-workloadb }
+          - { config: ycsb-workloadb2 }
+          - { config: ycsb-workloadc }
+          - { config: ycsb-workloadc2 }
 
     steps:
       - name: Install Tailscale
@@ -95,7 +96,7 @@ jobs:
         run: bin/task init build
 
       - name: Dance!
-        run: bin/task dance CONFIG=${{ matrix.config }}.yml
+        run: bin/task dance CONFIG=${{ matrix.config }}.yml VERBOSE_FLAG=${{ matrix.verbose || 'false' }}
         env:
           DANCE_PUSH: ${{ secrets.DANCE_PUSH }}
 

.gitmodules

@@ -30,7 +30,7 @@
 	branch = master
 [submodule "mongo-core-test"]
 	path = projects/mongo-core-test
-    url = https://github.com/mongodb-developer/mongo-core-test.git
+    url = https://github.com/FerretDB/mongo-core-test.git
 	branch = main
 
 [submodule "enmeshed-runtime"]

Taskfile.yaml

@@ -5,6 +5,7 @@ vars:
   DB: ""
   CONFIG: ""
   RACE_FLAG: -race={{and (ne OS "windows") (ne ARCH "arm") (ne ARCH "riscv64")}}
+  VERBOSE_FLAG: false
 
 tasks:
   init-tools:
@@ -86,7 +87,7 @@ tasks:
     deps: [build]
     dir: projects
     cmds:
-      - ../bin/dance --database={{.DB}} {{.CONFIG}}
+      - ../bin/dance --verbose={{.VERBOSE_FLAG}} --database={{.DB}} {{.CONFIG}}
 
   lint:
     desc: "Run linters"

internal/configload/configload.go

@@ -122,6 +122,7 @@ func templateData(uri url.URL) (map[string]any, error) {
 		"MONGODB_URI_SHA1":        sha1URI.String(),
 		"MONGODB_URI_SHA256":      sha256URI.String(),
 		"MONGODB_URI_DOCKER_HOST": dockerHostURI.String(),
+		"MONGODB_PORT":            port,
 	}, nil
 }
 

internal/configload/runner.go

@@ -29,9 +29,10 @@ type runnerParams interface {
 
 // runnerParamsCommand represents `command` runner parameters in the project configuration YAML file.
 type runnerParamsCommand struct {
-	Dir   string `yaml:"dir"`
-	Setup string `yaml:"setup"`
-	Tests []struct {
+	Dir      string `yaml:"dir"`
+	Setup    string `yaml:"setup"`
+	Teardown string `yaml:"teardown"`
+	Tests    []struct {
 		Name string `yaml:"name"`
 		Cmd  string `yaml:"cmd"`
 	} `yaml:"tests"`
@@ -44,8 +45,9 @@ func (rp *runnerParamsCommand) convert() (config.RunnerParams, error) {
 	}
 
 	res := &config.RunnerParamsCommand{
-		Dir:   rp.Dir,
-		Setup: rp.Setup,
+		Dir:      rp.Dir,
+		Setup:    rp.Setup,
+		Teardown: rp.Teardown,
 	}
 
 	for _, t := range rp.Tests {

internal/runner/command/command.go

@@ -114,7 +114,8 @@ func (c *command) Run(ctx context.Context) (res map[string]config.TestResult, er
 		defer func() {
 			c.l.InfoContext(ctx, "Running teardown")
 
-			if b, err = execScript(ctx, c.p.Dir, "teardown", c.p.Teardown, c.verbose); err != nil {
+			// canceled context should not prevent teardown
+			if b, err = execScript(context.WithoutCancel(ctx), c.p.Dir, "teardown", c.p.Teardown, c.verbose); err != nil {
 				err = fmt.Errorf("%s\n%w", b, err)
 			}
 		}()

internal/runner/command/command_test.go

@@ -93,7 +93,11 @@ func TestCommand(t *testing.T) {
 		c, err := New(p, slog.Default(), false)
 		require.NoError(t, err)
 
-		_, err = c.Run(ctx)
+		canceledCtx, cancel := context.WithCancel(ctx)
+
+		cancel()
+
+		_, err = c.Run(canceledCtx)
 		require.ErrorContains(t, err, "exit status 2")
 	})
 

projects/mongo-core-test

@@ -0,0 +1,28 @@
+---
+runner: command
+params:
+  dir: mongo-core-test
+  setup: |
+    env COMPOSE_FILE='mongo8.yml' TEST_DIRECTORY=$(readlink -f ../mongo/jstests) docker compose up -d legacy-mongo
+  teardown: |
+    env COMPOSE_FILE='mongo8.yml' docker compose down legacy-mongo
+
+  tests:
+    - name: noauth
+      cmd: >
+        env
+        COMPOSE_FILE='mongo8.yml'
+        TEST_DIRECTORY=$(readlink -f ../mongo/jstests)
+        MONGO_PORT='{{.MONGODB_PORT}}'
+        MONGO_USERNAME=''
+        MONGO_PASSWORD=''
+        python3 run.py 8
+
+results:
+  mongodb:
+    stats:
+      pass: 1
+
+  ferretdb2:
+    stats:
+      pass: 1