WIP

Author: ZPascal

cmd/routing-api/main_test.go

@@ -245,10 +245,10 @@ var _ = Describe("Main", func() {
 			gormDB, err = gorm.Open(getGormDialect(rapiConfig.SqlDB.Type, connectionString), &gorm.Config{})
 			Expect(err).NotTo(HaveOccurred())
 		})
-		AfterEach(func() {
-			gormDB.AutoMigrate(&models.RouterGroupDB{})
-			Expect(os.Remove(configPath)).To(Succeed())
-		})
+		/*		AfterEach(func() {
+				gormDB.AutoMigrate(&models.RouterGroupDB{})
+				Expect(os.Remove(configPath)).To(Succeed())
+			})*/
 		It("should fail with an error", func() {
 			routingAPIRunner := testrunner.New(routingAPIBinPath, routingAPIArgs)
 			proc := ifrit.Invoke(routingAPIRunner)

cmd/routing-api/routing_api_suite_test.go

@@ -4,8 +4,8 @@ import (
 	"crypto/tls"
 	"encoding/pem"
 	"fmt"
+	"io"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -67,11 +67,10 @@ var (
 	mtlsAPIClientCert     tls.Certificate
 )
 
-func TestMain(m *testing.M) {
+func TestMainSuite(t *testing.T) {
 	RegisterFailHandler(Fail)
-	os.Exit(m.Run())
-	//TODO Adapt the test execution
-	RunSpecs(m, "Main Suite")
+	suiteConfig, reporterConfig := GinkgoConfiguration()
+	RunSpecs(t, "Main Suite", suiteConfig, reporterConfig)
 }
 
 var _ = SynchronizedBeforeSuite(
@@ -85,8 +84,7 @@ var _ = SynchronizedBeforeSuite(
 		return []byte(strings.Join([]string{routingAPIBin, locketPath}, ","))
 	},
 	func(binPaths []byte) {
-		//TODO Adapt the logger
-		grpclog.SetLogger(log.New(ioutil.Discard, "", 0))
+		grpclog.SetLoggerV2(grpclog.NewLoggerV2(io.Discard, io.Discard, io.Discard))
 
 		path := string(binPaths)
 		routingAPIBinPath = strings.Split(path, ",")[0]

migration/V2_update_rg_migration.go

@@ -20,7 +20,7 @@ func (v *V2UpdateRgMigration) Version() int {
 func (v *V2UpdateRgMigration) Run(sqlDB *db.SqlDB) error {
 	type routerGroup struct {
 		models.Model
-		Name string `gorm:"index:idx_rg_name,unique" json:"name"`
+		Name string `gorm:"size:255;index:idx_rg_name,unique" json:"name"`
 	}
 	return sqlDB.Client.AddUniqueIndex("idx_rg_name", &routerGroup{})
 }