fix(tests): run integration tests on windows

charmbracelet · Dec 7, 2023 · 73c7472 · 73c7472
1 parent 44ef6f7
commit 73c7472
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 3 deletions.
diff --git a/testscript/script_test.go b/testscript/script_test.go
@@ -91,6 +91,7 @@ func TestScript(t *testing.T) {
 			"dos2unix":      cmdDos2Unix,
 			"new-webhook":   cmdNewWebhook,
 			"waitforserver": cmdWaitforserver,
+			"stopserver":    cmdStopserver,
 		},
 		Setup: func(e *testscript.Env) error {
 			// Add binPath to PATH
@@ -116,6 +117,9 @@ func TestScript(t *testing.T) {
 			e.Setenv("SSH_KNOWN_HOSTS_FILE", filepath.Join(t.TempDir(), "known_hosts"))
 			e.Setenv("SSH_KNOWN_CONFIG_FILE", filepath.Join(t.TempDir(), "config"))
 
+			// This is used to set up test specific configuration and http endpoints
+			e.Setenv("SOFT_SERVE_TESTRUN", "1")
+
 			// Soft Serve debug environment variables
 			for _, env := range []string{
 				"SOFT_SERVE_DEBUG",
@@ -418,6 +422,14 @@ func cmdWaitforserver(ts *testscript.TestScript, neg bool, args []string) {
 	}
 }
 
+func cmdStopserver(ts *testscript.TestScript, neg bool, args []string) {
+	// stop the server
+	resp, err := http.DefaultClient.Head(fmt.Sprintf("%s/__stop", ts.Getenv("SOFT_SERVE_HTTP_PUBLIC_URL")))
+	check(ts, err, neg)
+	defer resp.Body.Close()
+	time.Sleep(time.Second * 2) // Allow some time for the server to stop
+}
+
 func setupPostgres(t testscript.T, cfg *config.Config) (error, func()) {
 	// Indicates postgres
 	// Create a disposable database

diff --git a/testscript/testdata/help.txtar b/testscript/testdata/help.txtar
@@ -9,6 +9,10 @@ waitforserver
 soft --help
 cmpenv stdout help.txt
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 -- help.txt --
 Soft Serve is a self-hostable Git server for the command line.
 

diff --git a/testscript/testdata/http.txtar b/testscript/testdata/http.txtar
@@ -138,6 +138,10 @@ stdout '404.*'
 curl http://$TOKEN@localhost:$HTTP_PORT/repo2.git?go-get=1
 cmpenv stdout goget.txt
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 -- http1.txt --
 {"transfer":"basic","objects":[{"oid":"","size":0,"error":{"code":422,"message":"invalid object"}}],"hash_algo":"sha256"}
 -- http2.txt --

diff --git a/testscript/testdata/jwt.txtar b/testscript/testdata/jwt.txtar
@@ -17,3 +17,7 @@ usoft jwt
 stdout '.*\..*\..*'
 usoft jwt repo
 stdout '.*\..*\..*'
+
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
diff --git a/testscript/testdata/mirror.txtar b/testscript/testdata/mirror.txtar
@@ -79,6 +79,10 @@ cmp stdout info2.txt
 soft repo blob charmbracelet/test LICENSE
 stdout '.*Creative Commons.*'
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 
 -- info1.txt --
 Project Name:

diff --git a/testscript/testdata/repo-blob.txtar b/testscript/testdata/repo-blob.txtar
@@ -48,6 +48,9 @@ stderr 'revision does not exist'
 ! stdout .
 stderr 'revision does not exist'
 
+# stop the server
+[windows] stopserver
+
 -- blob1.txt --
 # Hello\n\nwelcome
 -- blob2.txt --

diff --git a/testscript/testdata/repo-collab.txtar b/testscript/testdata/repo-collab.txtar
@@ -22,3 +22,7 @@ stdout 'foo'
 soft repo collab remove test foo
 soft repo collab list test
 ! stdout .
+
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
diff --git a/testscript/testdata/repo-commit.txtar b/testscript/testdata/repo-commit.txtar
@@ -15,6 +15,10 @@ soft repo import basic1 https://github.com/git-fixtures/basic
 soft repo commit basic1 b8e471f58bcbca63b07bda20e428190409c2db47
 cmp stdout commit1.txt
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 -- commit1.txt --
 commit b8e471f58bcbca63b07bda20e428190409c2db47
 Author: Daniel Ripolles

diff --git a/testscript/testdata/repo-create.txtar b/testscript/testdata/repo-create.txtar
@@ -119,6 +119,10 @@ stdout 'repo2'
 usoft repo delete repo2
 ! exists $DATA_PATH/repos/repo2.git
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 
 -- readme.md --
 # Project\nfoo

diff --git a/testscript/testdata/repo-delete.txtar b/testscript/testdata/repo-delete.txtar
@@ -12,3 +12,7 @@ soft repo delete repo-to-delete
 stderr '.*not found.*'
 soft repo list
 stdout 'repo1'
+
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
diff --git a/testscript/testdata/repo-import.txtar b/testscript/testdata/repo-import.txtar
@@ -23,6 +23,10 @@ soft repo import --name 'repo33' --description 'descriptive' repo3 https://githu
 soft repo info repo3
 cmp stdout repo3.txt
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 -- repo3.txt --
 Project Name: repo33
 Repository: repo3

diff --git a/testscript/testdata/repo-perms.txtar b/testscript/testdata/repo-perms.txtar
@@ -82,6 +82,10 @@ usoft repo delete repo1
 usoft repo list
 ! stdout .
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 -- info.txt --
 Project Name: proj
 Repository: repo1

diff --git a/testscript/testdata/repo-push.txtar b/testscript/testdata/repo-push.txtar
@@ -1,8 +1,5 @@
 # vi: set ft=conf
 
-# convert crlf to lf on windows
-[windows] dos2unix
-
 # start soft serve
 exec soft serve &
 # wait for server to start
@@ -16,3 +13,6 @@ git clone ssh://localhost:$SSH_PORT/repo-empty repo-empty
 
 # push repo
 ! git -C repo-empty push origin HEAD
+
+# stop the server
+[windows] stopserver
diff --git a/testscript/testdata/repo-tree.txtar b/testscript/testdata/repo-tree.txtar
@@ -47,6 +47,9 @@ stderr 'file not found'
 ! stdout .
 stderr 'revision does not exist'
 
+# stop the server
+[windows] stopserver
+
 -- tree1.txt --
 drwxrwxrwx	-	 folder
 -rw-r--r--	-	 .hidden

diff --git a/testscript/testdata/repo-webhooks.txtar b/testscript/testdata/repo-webhooks.txtar
@@ -28,3 +28,7 @@ git -C repo-123 push origin HEAD
 # list webhook deliveries
 soft repo webhook deliver list repo-123 1
 stdout '✅.*push.*'
+
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
diff --git a/testscript/testdata/set-username.txtar b/testscript/testdata/set-username.txtar
@@ -17,6 +17,10 @@ soft set-username test
 soft info
 cmpenv stdout info2.txt
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 -- info1.txt --
 Username: admin
 Admin: true

diff --git a/testscript/testdata/settings.txtar b/testscript/testdata/settings.txtar
@@ -41,3 +41,6 @@ stdout 'admin-access.*'
 ! stdout .
 stderr .
 
+# stop the server
+[windows] stopserver
+
diff --git a/testscript/testdata/ssh.txtar b/testscript/testdata/ssh.txtar
@@ -92,6 +92,10 @@ stdout '.*header.*Bearer.*href.*expires_in.*expires_at.*'
 usoft git-lfs-authenticate repo2p upload
 stdout '.*header.*Bearer.*href.*expires_in.*expires_at.*'
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 -- argserr1.txt --
 Error: accepts 1 arg(s), received 0
 -- argserr2.txt --

diff --git a/testscript/testdata/token.txtar b/testscript/testdata/token.txtar
@@ -31,3 +31,6 @@ usoft token delete 1
 stderr 'Access token deleted'
 ! usoft token delete 1
 stderr 'token not found'
+
+# stop the server
+[windows] stopserver
diff --git a/testscript/testdata/user_management.txtar b/testscript/testdata/user_management.txtar
@@ -68,6 +68,10 @@ soft user delete foo2
 soft user list
 cmpenv stdout list1.txt
 
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
+
 
 -- info.txt --
 Username: admin