Merge commit '586ecef23532cc465c8617381fe377006e1e5f28'

Author: OutOfBedlam

api/machsvr/machsvr_test.go

@@ -34,14 +34,14 @@ func TestAll(t *testing.T) {
 	testsuite.TestAll(t, machsvrDB)
 	testsuite.DropTestTables(machsvrDB)
 
-	testsuite.CreateTestTables(machsvrDB)
+	testsuite.CreateTestTables(machrpcDB)
 	testsuite.TestAll(t, machrpcDB,
 		tcRpcPing,
 		tcRpcUserAuth,
 		tcRpcExplain,
 		tcRpcExec,
 	)
-	testsuite.DropTestTables(machsvrDB)
+	testsuite.DropTestTables(machrpcDB)
 }
 
 func connectRpc(t *testing.T, ctx context.Context) *machrpc.ConnHandle {

api/testsuite/tables.go

@@ -382,7 +382,17 @@ func InsertMeta(t *testing.T, db api.Database, ctx context.Context) {
 	var id, name, factory, equipment string
 	for rows.Next() {
 		require.NoError(t, rows.Scan(&id, &name, &factory, &equipment))
-		fmt.Printf("id: %s, name: %s, factory: %s, equipment: %s\n", id, name, factory, equipment)
+		if id == "1" {
+			require.Equal(t, "FA1_CNC", name)
+			require.Equal(t, "FA1", factory)
+			require.Equal(t, "CNC", equipment)
+		} else if id == "2" {
+			require.Equal(t, "FA4_MILLING", name)
+			require.Equal(t, "FA4", factory)
+			require.Equal(t, "MILLING", equipment)
+		} else {
+			t.Fatalf("Unknown tag metadata: %s", id)
+		}
 	}
 	rows.Close()
 

api/testsuite/testsuite.go

@@ -69,8 +69,10 @@ func TestAll(t *testing.T, db api.Database, tests ...func(*testing.T)) {
 
 func DropTestTables(db api.Database) error {
 	ctx := context.TODO()
-	conn, _ := db.Connect(ctx, api.WithPassword("sys", "manager"))
-	defer conn.Close()
+	conn, err := db.Connect(ctx, api.WithPassword("sys", "manager"))
+	if err != nil {
+		return err
+	}
 	if r := conn.Exec(ctx, "DROP TABLE tag_data"); r.Err() != nil {
 		return r.Err()
 	}
@@ -80,7 +82,7 @@ func DropTestTables(db api.Database) error {
 	if r := conn.Exec(ctx, "DROP TABLE log_data"); r.Err() != nil {
 		return r.Err()
 	}
-	return nil
+	return conn.Close()
 }
 
 func CreateTestTables(db api.Database) error {
@@ -290,7 +292,7 @@ func (s *Server) StopServer(m *testing.M) {
 	if err := s.grpcListener.Close(); err != nil {
 		panic(err)
 	}
-	s.grpcServer.Stop()
+	s.grpcServer.GracefulStop()
 	s.grpcServerWg.Wait()
 	if err := s.machsvrDatabase.Shutdown(); err != nil {
 		panic(err)