Changeset 622 in code for trunk

Timestamp:

Oct 11, 2021, 1:57:37 PM (4 years ago)

Author:

contact

Message:

Run server test with PostgreSQL too

File:

• trunk/server_test.go (modified) (5 diffs)

trunk/server_test.go

@@ -2 +2 @@
 
 import (
+        "database/sql"
         "net"
+        "os"
         "testing"
 
@@ -16 +18 @@
 )
 
-func createTempDB(t *testing.T) Database {
+func createTempSqliteDB(t *testing.T) Database {
         db, err := OpenDB("sqlite3", ":memory:")
         if err != nil {
@@ -28 +30 @@
 }
 
+func createTempPostgresDB(t *testing.T) Database {
+        db := &PostgresDB{db: openTempPostgresDB(t)}
+        if err := db.upgrade(); err != nil {
+                t.Fatalf("failed to upgrade PostgreSQL database: %v", err)
+        }
+
+        return db
+}
+
 func createTestUser(t *testing.T, db Database) *User {
         hashed, err := bcrypt.GenerateFromPassword([]byte(testPassword), bcrypt.DefaultCost)
@@ -142 +153 @@
 }
 
-func TestServer(t *testing.T) {
-        db := createTempDB(t)
+func testServer(t *testing.T, db Database) {
         user := createTestUser(t, db)
         network, upstream := createTestUpstream(t, db, user)
@@ -185 +195 @@
         }
 }
+
+func TestServer(t *testing.T) {
+        t.Run("sqlite", func(t *testing.T) {
+                db := createTempSqliteDB(t)
+                testServer(t, db)
+        })
+
+        t.Run("postgres", func(t *testing.T) {
+                db := createTempPostgresDB(t)
+                testServer(t, db)
+        })
+}