From 719deacc3d65a2f059fe0b9028d673eccd8f92ac Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Thu, 28 Jun 2018 13:14:18 -0700 Subject: [PATCH] Fixes #686 Signed-off-by: Derek Collison --- server/configs/reload/reload.conf | 2 ++ server/configs/reload/test.conf | 2 ++ server/configs/tls_ciphers.conf | 2 +- server/reload_test.go | 6 +++--- server/signal_test.go | 9 +++++++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/server/configs/reload/reload.conf b/server/configs/reload/reload.conf index 4d28073e..7785093e 100644 --- a/server/configs/reload/reload.conf +++ b/server/configs/reload/reload.conf @@ -1,5 +1,7 @@ include 'platform.conf' +port: 2233 + # logging options debug: true # enable on reload trace: true # enable on reload diff --git a/server/configs/reload/test.conf b/server/configs/reload/test.conf index fb037046..c47f321e 100644 --- a/server/configs/reload/test.conf +++ b/server/configs/reload/test.conf @@ -1,3 +1,5 @@ +port: 2233 + # logging options debug: false trace: false diff --git a/server/configs/tls_ciphers.conf b/server/configs/tls_ciphers.conf index 83a61f5f..df907080 100644 --- a/server/configs/tls_ciphers.conf +++ b/server/configs/tls_ciphers.conf @@ -25,6 +25,6 @@ tls { authorization { user: derek - password: buckley + password: monkey timeout: 1 } diff --git a/server/reload_test.go b/server/reload_test.go index bfabed78..1990c58f 100644 --- a/server/reload_test.go +++ b/server/reload_test.go @@ -54,7 +54,7 @@ func TestConfigReloadUnsupported(t *testing.T) { golden := &Options{ ConfigFile: config, Host: "0.0.0.0", - Port: 4222, + Port: 2233, AuthTimeout: 1.0, Debug: false, Trace: false, @@ -144,7 +144,7 @@ func TestConfigReloadInvalidConfig(t *testing.T) { golden := &Options{ ConfigFile: config, Host: "0.0.0.0", - Port: 4222, + Port: 2233, AuthTimeout: 1.0, Debug: false, Trace: false, @@ -210,7 +210,7 @@ func TestConfigReload(t *testing.T) { golden := &Options{ ConfigFile: config, Host: "0.0.0.0", - Port: 4222, + Port: 2233, AuthTimeout: 1.0, Debug: false, Trace: false, diff --git a/server/signal_test.go b/server/signal_test.go index 7a2f44d6..56cabe1b 100644 --- a/server/signal_test.go +++ b/server/signal_test.go @@ -20,6 +20,7 @@ import ( "fmt" "io/ioutil" "os" + "os/exec" "strings" "syscall" "testing" @@ -102,6 +103,14 @@ func TestSignalToReloadConfig(t *testing.T) { } func TestProcessSignalNoProcesses(t *testing.T) { + pgrepBefore := pgrep + pgrep = func() ([]byte, error) { + return nil, &exec.ExitError{} + } + defer func() { + pgrep = pgrepBefore + }() + err := ProcessSignal(CommandStop, "") if err == nil { t.Fatal("Expected error")