Add tests

cmd/server.go

@@ -34,5 +34,7 @@ func startServer(cfg *admin.Config) error {
 		server.Shutdown()
 	})
 
-	return server.Serve()
+	err := server.Serve()
+	utils.LogIgnoreErr("running server", err)
+	return err
 }

cmd/server_test.go

@@ -0,0 +1,60 @@
+package main
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"github.com/yohamta/dagu/internal/admin"
+	"github.com/yohamta/dagu/internal/settings"
+	"github.com/yohamta/dagu/internal/utils"
+)
+
+func Test_serverCommand(t *testing.T) {
+	app := makeApp()
+	dir := utils.MustTempDir("dagu_test_server")
+	os.Setenv("HOME", dir)
+
+	port := findPort(t)
+	os.Setenv(settings.CONFIG__ADMIN_PORT, port)
+	settings.InitTest(dir)
+
+	done := make(chan struct{})
+	go func() {
+		runAppTestOutput(app, appTest{
+			args: []string{"", "server"}, errored: false,
+			output: []string{"admin server is running "},
+		}, t)
+		close(done)
+	}()
+
+	time.Sleep(time.Millisecond * 100)
+
+	cfg := admin.DefaultConfig()
+	res, err := http.Post(
+		fmt.Sprintf("http://%s:%s/shutdown", cfg.Host, cfg.Port),
+		"application/json",
+		nil,
+	)
+	require.NoError(t, err)
+	require.Equal(t, http.StatusOK, res.StatusCode)
+
+	<-done
+}
+
+func findPort(t *testing.T) string {
+	t.Helper()
+	ln, err := net.Listen("tcp", ":0")
+	if err != nil {
+		panic(err)
+	}
+	port := ln.Addr().(*net.TCPAddr).Port
+	if err := ln.Close(); err != nil {
+		panic(err)
+	}
+	return fmt.Sprintf("%d", port)
+}

internal/admin/config.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strconv"
 
+	"github.com/yohamta/dagu/internal/settings"
 	"github.com/yohamta/dagu/internal/utils"
 )
 
@@ -43,7 +44,7 @@ func (c *Config) setup() {
 		c.Host = "127.0.0.1"
 	}
 	if c.Port == "" {
-		c.Port = "8000"
+		c.Port = settings.MustGet(settings.CONFIG__ADMIN_PORT)
 	}
 	if len(c.Env) == 0 {
 		env := utils.DefaultEnv()

internal/admin/http.go

@@ -41,7 +41,7 @@ func (svr *server) Serve() (err error) {
 	log.Printf("admin server is running at \"http://%s\"\n", svr.addr)
 
 	err = svr.server.ListenAndServe()
-	if err != http.ErrServerClosed {
+	if err == http.ErrServerClosed {
 		err = nil
 	}
 	if err != nil {

internal/admin/http_test.go

@@ -18,15 +18,15 @@ func TestHttpServerStartShutdown(t *testing.T) {
 	os.RemoveAll(dir)
 
 	host := "127.0.0.1"
-	port := findPort()
+	port := findPort(t)
 	server := NewServer(&Config{
 		Host: host,
 		Port: port,
 	})
 
 	go func() {
 		err := server.Serve()
-		require.Equal(t, http.ErrServerClosed, err)
+		require.NoError(t, err)
 	}()
 
 	time.Sleep(time.Millisecond * 300)
@@ -47,7 +47,7 @@ func TestHttpServerShutdownWithAPI(t *testing.T) {
 	os.RemoveAll(dir)
 
 	host := "127.0.0.1"
-	port := findPort()
+	port := findPort(t)
 	server := NewServer(&Config{
 		Host: host,
 		Port: port,
@@ -56,7 +56,7 @@ func TestHttpServerShutdownWithAPI(t *testing.T) {
 
 	go func() {
 		err := server.Serve()
-		require.Equal(t, http.ErrServerClosed, err)
+		require.NoError(t, err)
 	}()
 
 	time.Sleep(time.Millisecond * 300)
@@ -81,7 +81,7 @@ func TestHttpServerBasicAuth(t *testing.T) {
 	os.RemoveAll(dir)
 
 	host := "127.0.0.1"
-	port := findPort()
+	port := findPort(t)
 	server := NewServer(&Config{
 		Host:              host,
 		Port:              port,
@@ -92,7 +92,7 @@ func TestHttpServerBasicAuth(t *testing.T) {
 
 	go func() {
 		err := server.Serve()
-		require.Equal(t, http.ErrServerClosed, err)
+		require.NoError(t, err)
 	}()
 	defer server.Shutdown()
 
@@ -118,7 +118,8 @@ func TestHttpServerBasicAuth(t *testing.T) {
 	require.Equal(t, "200 OK", res.Status)
 }
 
-func findPort() string {
+func findPort(t *testing.T) string {
+	t.Helper()
 	ln, err := net.Listen("tcp", ":0")
 	if err != nil {
 		panic(err)

internal/settings/settings.go

@@ -13,8 +13,9 @@ var ErrConfigNotFound = fmt.Errorf("config not found")
 var cache map[string]string = nil
 
 const (
-	CONFIG__DATA_DIR = "DAGU__DATA"
-	CONFIG__LOGS_DIR = "DAGU__LOGS"
+	CONFIG__DATA_DIR   = "DAGU__DATA"
+	CONFIG__LOGS_DIR   = "DAGU__LOGS"
+	CONFIG__ADMIN_PORT = "CONFIG__ADMIN_PORT"
 )
 
 func MustGet(name string) string {
@@ -43,9 +44,9 @@ func load() {
 	cache[CONFIG__DATA_DIR] = config(
 		CONFIG__DATA_DIR,
 		path.Join(dir, "/.dagu/data"))
-	cache[CONFIG__LOGS_DIR] = config(
-		CONFIG__LOGS_DIR,
+	cache[CONFIG__LOGS_DIR] = config(CONFIG__LOGS_DIR,
 		path.Join(dir, "/.dagu/logs"))
+	cache[CONFIG__ADMIN_PORT] = config(CONFIG__ADMIN_PORT, "8000")
 }
 
 func InitTest(dir string) {