[TEST] improve webserver with panic

FreifunkBremen · Oct 11, 2017 · 5ed98f3 · 5ed98f3
1 parent 557a440
commit 5ed98f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/webserver/webserver.go b/webserver/webserver.go
@@ -17,6 +17,8 @@ func New(bindAddr, webroot string) *http.Server {
 func Start(srv *http.Server) {
 	// service connections
 	if err := srv.ListenAndServe(); err != nil {
-		panic(err)
+		if err != http.ErrServerClosed {
+			panic(err)
+		}
 	}
 }
diff --git a/webserver/webserver_test.go b/webserver/webserver_test.go
@@ -1,7 +1,6 @@
 package webserver
 
 import (
-	"fmt"
 	"testing"
 	"time"
 
@@ -14,17 +13,7 @@ func TestWebserver(t *testing.T) {
 	srv := New(":8080", "/tmp")
 	assert.NotNil(srv)
 
-	go func() {
-		defer func() {
-			if r := recover(); r != nil {
-				fmt.Println("catch valid panic")
-				assert.Equal("http: Server closed", r)
-			}
-		}()
-
-		Start(srv)
-
-	}()
+	go Start(srv)
 
 	time.Sleep(time.Millisecond * 200)