From 340a53fb80368dac7cad5c1ce3a961f78cc2287e Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 5 May 2015 22:53:14 -0600 Subject: [PATCH 1/3] Disabling fcgiclient tests until they can be rewritten --- config/setup/controller_test.go | 2 +- middleware/fastcgi/fcgiclient_test.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/setup/controller_test.go b/config/setup/controller_test.go index c49c24e75..7d0b0ec57 100644 --- a/config/setup/controller_test.go +++ b/config/setup/controller_test.go @@ -10,7 +10,7 @@ import ( // newTestController creates a new *Controller for // the input specified, with a filename of "Testfile" func newTestController(input string) *Controller { - return Controller{ + return &Controller{ Config: &server.Config{}, Dispenser: parse.NewDispenser("Testfile", strings.NewReader(input)), } diff --git a/middleware/fastcgi/fcgiclient_test.go b/middleware/fastcgi/fcgiclient_test.go index c18917bbd..f843548e2 100644 --- a/middleware/fastcgi/fcgiclient_test.go +++ b/middleware/fastcgi/fcgiclient_test.go @@ -1,3 +1,9 @@ +// NOTE: These tests were adapted from the original +// repository from which this package was forked. +// The tests are slow (~10s) and in dire need of rewriting. +// As such, the tests have been disabled to speed up +// automated builds until they can be properly written. + package fastcgi import ( @@ -185,7 +191,7 @@ func generateRandFile(size int) (p string, m string) { return } -func Test(t *testing.T) { +func Disabled_Test(t *testing.T) { // TODO: test chunked reader t_ = t From 20c01883c3d3c631bfce97610aed5305d99febc5 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 5 May 2015 22:54:13 -0600 Subject: [PATCH 2/3] Adding Travis CI manifest --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..6f29542f0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +language: go +script: go test ./... \ No newline at end of file From b2549c317c03f7e8c15ed7e7d02d693711b03a20 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 5 May 2015 23:19:14 -0600 Subject: [PATCH 3/3] Minor flag help text change; go fmt --- main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 5caee296b..d503ed144 100644 --- a/main.go +++ b/main.go @@ -20,14 +20,14 @@ import ( ) var ( - conf string - http2 bool // TODO: temporary flag until http2 is standard - quiet bool - cpu string + conf string + http2 bool // TODO: temporary flag until http2 is standard + quiet bool + cpu string ) func init() { - flag.StringVar(&conf, "conf", "", "Configuration file to use") + flag.StringVar(&conf, "conf", "", "Configuration file to use (default="+config.DefaultConfigFile+")") flag.BoolVar(&http2, "http2", true, "Enable HTTP/2 support") // TODO: temporary flag until http2 merged into std lib flag.BoolVar(&quiet, "quiet", false, "Quiet mode (no initialization output)") flag.StringVar(&cpu, "cpu", "100%", "CPU cap")