From 490f309cb7a1c83a5ded2f708041cae577480e47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:44:04 +0000 Subject: [PATCH 1/3] Bump github.com/godogx/clocksteps from 0.3.0 to 0.4.0 in /tests/suite Bumps [github.com/godogx/clocksteps](https://github.com/godogx/clocksteps) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/godogx/clocksteps/releases) - [Commits](https://github.com/godogx/clocksteps/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: github.com/godogx/clocksteps dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tests/suite/go.mod | 2 +- tests/suite/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/suite/go.mod b/tests/suite/go.mod index 36ef320..ca4b23c 100644 --- a/tests/suite/go.mod +++ b/tests/suite/go.mod @@ -6,7 +6,7 @@ require ( github.com/Masterminds/squirrel v1.5.4 github.com/bool64/sqluct v0.2.1 github.com/cucumber/godog v0.13.0 - github.com/godogx/clocksteps v0.3.0 + github.com/godogx/clocksteps v0.4.0 github.com/jmoiron/sqlx v1.3.5 github.com/prometheus/client_golang v1.17.0 github.com/stretchr/testify v1.8.4 diff --git a/tests/suite/go.sum b/tests/suite/go.sum index fd9c13b..daa7400 100644 --- a/tests/suite/go.sum +++ b/tests/suite/go.sum @@ -63,8 +63,8 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/godogx/clocksteps v0.3.0 h1:n62MMtWUZrIvUs0vvHFxUiojGE+dzadpfhUbfXJiBxY= -github.com/godogx/clocksteps v0.3.0/go.mod h1:/FW+JCcCR7Gjps8clGdpnENzo92ElywroJ2sBKNzYGY= +github.com/godogx/clocksteps v0.4.0 h1:vYyTph5tBi0dO0QTGSZUB2cYiih5SCZIXJ0RJjUxHYg= +github.com/godogx/clocksteps v0.4.0/go.mod h1:LY6LrxLlnOBH/BTBGzGP9WbMtDiu6v8afDJL0UvuKHo= github.com/godogx/dbsteps v0.1.2 h1:MLpxpqCxXZrdvA/r8o8M+xKjrpmb+RTye1YWkvATFyk= github.com/godogx/dbsteps v0.1.2/go.mod h1:kY6x9odRDEfymsLJ/O3VnX4LJBa23PhTdKjJzJgnMJM= github.com/godogx/resource v0.1.1 h1:1vbznIn1mUCP+9TzJp9v8QKm54kAMTe38CBLnFBk0j8= From f07462e8d91c4a73ea06a56d580e3b10f6161c94 Mon Sep 17 00:00:00 2001 From: nhatthm-bot <105750906+nhatthm-bot@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:44:34 +0000 Subject: [PATCH 2/3] go mod tidy --- tests/mssql/go.mod | 2 +- tests/mssql/go.sum | 4 ++-- tests/mysql/go.mod | 2 +- tests/mysql/go.sum | 4 ++-- tests/postgres/go.mod | 2 +- tests/postgres/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/mssql/go.mod b/tests/mssql/go.mod index 2662228..6e4811c 100644 --- a/tests/mssql/go.mod +++ b/tests/mssql/go.mod @@ -42,7 +42,7 @@ require ( github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect - github.com/godogx/clocksteps v0.3.0 // indirect + github.com/godogx/clocksteps v0.4.0 // indirect github.com/godogx/dbsteps v0.1.2 // indirect github.com/godogx/resource v0.1.1 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect diff --git a/tests/mssql/go.sum b/tests/mssql/go.sum index 3c90986..ad4e645 100644 --- a/tests/mssql/go.sum +++ b/tests/mssql/go.sum @@ -545,8 +545,8 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godogx/clocksteps v0.3.0 h1:n62MMtWUZrIvUs0vvHFxUiojGE+dzadpfhUbfXJiBxY= -github.com/godogx/clocksteps v0.3.0/go.mod h1:/FW+JCcCR7Gjps8clGdpnENzo92ElywroJ2sBKNzYGY= +github.com/godogx/clocksteps v0.4.0 h1:vYyTph5tBi0dO0QTGSZUB2cYiih5SCZIXJ0RJjUxHYg= +github.com/godogx/clocksteps v0.4.0/go.mod h1:LY6LrxLlnOBH/BTBGzGP9WbMtDiu6v8afDJL0UvuKHo= github.com/godogx/dbsteps v0.1.2 h1:MLpxpqCxXZrdvA/r8o8M+xKjrpmb+RTye1YWkvATFyk= github.com/godogx/dbsteps v0.1.2/go.mod h1:kY6x9odRDEfymsLJ/O3VnX4LJBa23PhTdKjJzJgnMJM= github.com/godogx/resource v0.1.1 h1:1vbznIn1mUCP+9TzJp9v8QKm54kAMTe38CBLnFBk0j8= diff --git a/tests/mysql/go.mod b/tests/mysql/go.mod index c690570..c47af25 100644 --- a/tests/mysql/go.mod +++ b/tests/mysql/go.mod @@ -37,7 +37,7 @@ require ( github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect - github.com/godogx/clocksteps v0.3.0 // indirect + github.com/godogx/clocksteps v0.4.0 // indirect github.com/godogx/dbsteps v0.1.2 // indirect github.com/godogx/resource v0.1.1 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect diff --git a/tests/mysql/go.sum b/tests/mysql/go.sum index fb89341..26c8ecd 100644 --- a/tests/mysql/go.sum +++ b/tests/mysql/go.sum @@ -532,8 +532,8 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godogx/clocksteps v0.3.0 h1:n62MMtWUZrIvUs0vvHFxUiojGE+dzadpfhUbfXJiBxY= -github.com/godogx/clocksteps v0.3.0/go.mod h1:/FW+JCcCR7Gjps8clGdpnENzo92ElywroJ2sBKNzYGY= +github.com/godogx/clocksteps v0.4.0 h1:vYyTph5tBi0dO0QTGSZUB2cYiih5SCZIXJ0RJjUxHYg= +github.com/godogx/clocksteps v0.4.0/go.mod h1:LY6LrxLlnOBH/BTBGzGP9WbMtDiu6v8afDJL0UvuKHo= github.com/godogx/dbsteps v0.1.2 h1:MLpxpqCxXZrdvA/r8o8M+xKjrpmb+RTye1YWkvATFyk= github.com/godogx/dbsteps v0.1.2/go.mod h1:kY6x9odRDEfymsLJ/O3VnX4LJBa23PhTdKjJzJgnMJM= github.com/godogx/resource v0.1.1 h1:1vbznIn1mUCP+9TzJp9v8QKm54kAMTe38CBLnFBk0j8= diff --git a/tests/postgres/go.mod b/tests/postgres/go.mod index f7fb80c..bde06f3 100644 --- a/tests/postgres/go.mod +++ b/tests/postgres/go.mod @@ -39,7 +39,7 @@ require ( github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect - github.com/godogx/clocksteps v0.3.0 // indirect + github.com/godogx/clocksteps v0.4.0 // indirect github.com/godogx/dbsteps v0.1.2 // indirect github.com/godogx/resource v0.1.1 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect diff --git a/tests/postgres/go.sum b/tests/postgres/go.sum index 7a875df..f20950c 100644 --- a/tests/postgres/go.sum +++ b/tests/postgres/go.sum @@ -534,8 +534,8 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godogx/clocksteps v0.3.0 h1:n62MMtWUZrIvUs0vvHFxUiojGE+dzadpfhUbfXJiBxY= -github.com/godogx/clocksteps v0.3.0/go.mod h1:/FW+JCcCR7Gjps8clGdpnENzo92ElywroJ2sBKNzYGY= +github.com/godogx/clocksteps v0.4.0 h1:vYyTph5tBi0dO0QTGSZUB2cYiih5SCZIXJ0RJjUxHYg= +github.com/godogx/clocksteps v0.4.0/go.mod h1:LY6LrxLlnOBH/BTBGzGP9WbMtDiu6v8afDJL0UvuKHo= github.com/godogx/dbsteps v0.1.2 h1:MLpxpqCxXZrdvA/r8o8M+xKjrpmb+RTye1YWkvATFyk= github.com/godogx/dbsteps v0.1.2/go.mod h1:kY6x9odRDEfymsLJ/O3VnX4LJBa23PhTdKjJzJgnMJM= github.com/godogx/resource v0.1.1 h1:1vbznIn1mUCP+9TzJp9v8QKm54kAMTe38CBLnFBk0j8= From 507d53f15c73fde8495706ab72b7079fd8647bf5 Mon Sep 17 00:00:00 2001 From: nhatthm Date: Tue, 21 Nov 2023 19:49:06 +0100 Subject: [PATCH 3/3] Fix clocksteps upgrade --- tests/suite/customer.go | 2 +- tests/suite/observability.go | 2 +- tests/suite/suite.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/suite/customer.go b/tests/suite/customer.go index a9ec18a..dec169c 100644 --- a/tests/suite/customer.go +++ b/tests/suite/customer.go @@ -35,7 +35,7 @@ func (t *customerTests) constructRepository() { t.repository = t.construct(newDatabaseExecer(t.runner, t.usePreparer), t.clock) } -func (t *customerTests) RegisterContext(sc *godog.ScenarioContext) { +func (t *customerTests) RegisterSteps(sc *godog.ScenarioContext) { sc.Before(func(ctx context.Context, _ *godog.Scenario) (context.Context, error) { db, err := openDB(t.databaseDriver, t.databaseDSN) if err != nil { diff --git a/tests/suite/observability.go b/tests/suite/observability.go index 82c0d1f..a8e0ba3 100644 --- a/tests/suite/observability.go +++ b/tests/suite/observability.go @@ -17,7 +17,7 @@ type observabilityTests struct { promExporter *prometheus.Exporter } -func (t *observabilityTests) RegisterContext(sc *godog.ScenarioContext) { +func (t *observabilityTests) RegisterSteps(sc *godog.ScenarioContext) { // Reset prometheus exporter for every test. sc.Before(func(ctx context.Context, _ *godog.Scenario) (context.Context, error) { promExporter, err := newPrometheusExporter() diff --git a/tests/suite/suite.go b/tests/suite/suite.go index 287762c..798da68 100644 --- a/tests/suite/suite.go +++ b/tests/suite/suite.go @@ -105,10 +105,10 @@ func (s suite) runTests(tb testing.TB, sc suiteContext) error { suite := godog.TestSuite{ Name: "Integration", ScenarioInitializer: func(sc *godog.ScenarioContext) { - clock.RegisterContext(sc) + clock.RegisterSteps(sc) dbm.RegisterSteps(sc) - otelsqlTests.RegisterContext(sc) - customerTests.RegisterContext(sc) + otelsqlTests.RegisterSteps(sc) + customerTests.RegisterSteps(sc) }, Options: &godog.Options{ Format: "pretty",