Skip to content

Commit

Permalink
Fix tests with changed output
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay committed Jun 27, 2019
1 parent 09d09bb commit 60d32d4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion containers/ddev-webserver/scripts/healthcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ htmlaccess=false
mailhog=false
if curl --fail -s 127.0.0.1/phpstatus >/dev/null ; then
phpstatus=true
printf "phpstatus: Ok "
printf "phpstatus: OK "
else
printf "phpstatus FAILED "
fi
Expand Down
4 changes: 2 additions & 2 deletions pkg/dockerutil/dockerutils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ func TestGetContainerHealth(t *testing.T) {
healthDetail, err := ContainerWait(15, labels)
assert.NoError(err)

assert.Equal("phpstatus: OK, /var/www/html: OK, mailhog: OK", healthDetail)
assert.Equal("phpstatus: Ok /var/www/html: OK mailhog: OK ", healthDetail)

status, healthDetail = GetContainerHealth(container)
assert.Equal(status, "healthy")
assert.Equal("phpstatus: OK, /var/www/html: OK, mailhog: OK", healthDetail)
assert.Equal("phpstatus: Ok /var/www/html: OK mailhog: OK ", healthDetail)
}

// TestContainerWait tests the error cases for the container check wait loop.
Expand Down

0 comments on commit 60d32d4

Please sign in to comment.