test: moved TestMigrator to ory/x/popx

go.mod

@@ -36,7 +36,7 @@ require (
 	github.com/ory/herodot v0.7.0
 	github.com/ory/sdk/swagutil v0.0.0-20200430101046-db494fac5eb6
 	github.com/ory/viper v1.7.4
-	github.com/ory/x v0.0.116
+	github.com/ory/x v0.0.118
 	github.com/pborman/uuid v1.2.0
 	github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5
 	github.com/pkg/errors v0.9.1

go.sum

@@ -909,8 +909,8 @@ github.com/ory/x v0.0.85/go.mod h1:s44V8t3xyjWZREcU+mWlp4h302rTuM4aLXcW+y5FbQ8=
 github.com/ory/x v0.0.88/go.mod h1:wrnJRjIfYXFY/AUiuUlcIUpLBDxFtWc+8x6toAeLZXU=
 github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g=
 github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE=
-github.com/ory/x v0.0.116 h1:gq47UBzFe9l8n4CToLFMAkjNwqTR+oq1JZYxhA0T5dM=
-github.com/ory/x v0.0.116/go.mod h1:ImFneVZHXPCeI1EYXLzRylIkOUMQnWT9Xwuasd8QHxw=
+github.com/ory/x v0.0.118 h1:WrTD3o25RNzvwDpYIEH3MSAYKy5yUv7JJkjQPCT0tjI=
+github.com/ory/x v0.0.118/go.mod h1:ImFneVZHXPCeI1EYXLzRylIkOUMQnWT9Xwuasd8QHxw=
 github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

persistence/sql/migratest/migration_test.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/ory/x/popx"
+
 	"github.com/ory/hydra/driver/configuration"
 	"github.com/ory/viper"
 	"github.com/ory/x/sqlcon/dockertest"
@@ -63,7 +65,7 @@ func TestMigrations(t *testing.T) {
 				}),
 			)
 
-			tm := NewTestMigrator(t, c, "../migrations", "./testdata")
+			tm := popx.NewTestMigrator(t, c, "../migrations", "./testdata")
 			require.NoError(t, tm.Up())
 
 			var lastClient *client.Client