serve: Fix nc command, test output matching

mbland · mbland · commit e68f0976e929 · 2017-08-18T23:02:59.000-04:00
On Linux, `nc` will exit with an error if the hostname argument is
empty. Setting it to `localhost` by default fixes the problem.

On Travis, it appears that file descriptors for standard output and
error still look like terminal file descriptors to Bash, even after
being redirected to a file (i.e. `[[ -t 0 &amp;&amp; -t 1 ]]` is always true)`.
This causes the `log` module from `go-script-bash` to always emit
terminal-formatted log labels. This played havoc with the previous
`assert_output_matches` assertions, which only checked for whitespace
between log label text and the log message text. The fix was to update
each assertion so that all log labels are immediately followed by `.* `.
diff --git a/scripts/serve b/scripts/serve
@@ -80,7 +80,7 @@ cl.serve_launch_redis() {
 }
 
 cl.serve_wait_for_redis() {
-  local redis_host="$1"
+  local redis_host="${1:-localhost}"
   local redis_pid="$2"
   local timeout="${CUSTOM_LINKS_REDIS_TIMEOUT:-5}"
 
diff --git a/tests/scripts/serve.bats b/tests/scripts/serve.bats
@@ -16,7 +16,6 @@ setup() {
   export CUSTOM_LINKS_REDIS_DIR="${BATS_TEST_ROOTDIR}/redis-test"
   export CUSTOM_LINKS_REDIS_LOG_PATH="${CUSTOM_LINKS_REDIS_DIR}/redis.log"
 
-  export _GO_LOG_FORMATTING=
   create_bats_test_dirs 'redis-test'
   create_config_file
 }
@@ -173,10 +172,10 @@ stop_background_run() {
     fail 'Append only file not created'
   fi
 
-  assert_output_matches 'INFO +redis-server running'
-  assert_output_matches 'INFO +custom-links server shutdown complete'
-  assert_output_matches 'RUN  +Shutting down redis-server'
-  assert_output_matches 'INFO +redis-server shutdown complete'
+  assert_output_matches 'INFO.* redis-server running'
+  assert_output_matches 'INFO.* custom-links server shutdown complete'
+  assert_output_matches 'RUN.*  Shutting down redis-server'
+  assert_output_matches 'INFO.* redis-server shutdown complete'
 }
 
 @test "$SUITE: launches redis-server in background from config file" {
@@ -190,8 +189,8 @@ stop_background_run() {
   wait_for_background_output "custom-links listening on port $CUSTOM_LINKS_PORT"
   stop_background_run
 
-  assert_output_matches 'INFO +custom-links server shutdown complete'
-  assert_output_matches 'INFO +redis-server shutdown complete'
+  assert_output_matches 'INFO.* custom-links server shutdown complete'
+  assert_output_matches 'INFO.* redis-server shutdown complete'
 }
 
 @test "$SUITE: uses redis-server that's already running" {
@@ -200,10 +199,10 @@ stop_background_run() {
   wait_for_background_output "custom-links listening on port $CUSTOM_LINKS_PORT"
   stop_background_run
 
-  fail_if output_matches 'INFO +redis-server running'
-  assert_output_matches  'INFO +custom-links server shutdown complete'
-  fail_if output_matches 'RUN  +Shutting down redis-server'
-  fail_if output_matches 'INFO +redis-server shutdown complete'
+  fail_if output_matches 'INFO.* redis-server running'
+  assert_output_matches  'INFO.* custom-links server shutdown complete'
+  fail_if output_matches 'RUN.*  Shutting down redis-server'
+  fail_if output_matches 'INFO.* redis-server shutdown complete'
 }
 
 @test "$SUITE: waits for redis-server on another host" {
@@ -215,14 +214,14 @@ stop_background_run() {
   wait_for_background_output "custom-links listening on port $CUSTOM_LINKS_PORT"
   stop_background_run
 
-  fail_if output_matches 'INFO +redis-server running'
-  assert_output_matches  'INFO +custom-links server shutdown complete'
+  fail_if output_matches 'INFO.* redis-server running'
+  assert_output_matches  'INFO.* custom-links server shutdown complete'
 }
 
 @test "$SUITE: error when redis-server launch fails" {
   stub_program_in_path 'redis-server' 'exit 1'
   CUSTOM_LINKS_REDIS_TIMEOUT='0' run_in_background ./go serve
-  wait_for_background_output "FATAL +Failed to launch redis-server"
+  wait_for_background_output "FATAL.* Failed to launch redis-server"
   restore_program_in_path 'redis-server'
   stop_background_run
   assert_failure

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ cl.serve_launch_redis() {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`cl.serve_wait_for_redis() {`
`83`		`- local redis_host="$1"`
	`83`	`+ local redis_host="${1:-localhost}"`
`84`	`84`	`local redis_pid="$2"`
`85`	`85`	`local timeout="${CUSTOM_LINKS_REDIS_TIMEOUT:-5}"`
`86`	`86`