Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-11-04 03:27:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Abiola Ibrahim 2015-05-06 09:06:14 +01:00
commit 434ec7b6ea
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml Normal file
View File

@ -0,0 +1,2 @@
language: go
script: go test ./...

2
config/setup/controller_test.go
View File

@ -10,7 +10,7 @@ import (
// newTestController creates a new *Controller for // newTestController creates a new *Controller for
// the input specified, with a filename of "Testfile" // the input specified, with a filename of "Testfile"
func newTestController(input string) *Controller { func newTestController(input string) *Controller {
return Controller{ return &Controller{
Config: &server.Config{}, Config: &server.Config{},
Dispenser: parse.NewDispenser("Testfile", strings.NewReader(input)), Dispenser: parse.NewDispenser("Testfile", strings.NewReader(input)),
} }

2
main.go
View File

@ -27,7 +27,7 @@ var (
) )
func init() { 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(&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.BoolVar(&quiet, "quiet", false, "Quiet mode (no initialization output)")
flag.StringVar(&cpu, "cpu", "100%", "CPU cap") flag.StringVar(&cpu, "cpu", "100%", "CPU cap")

8
middleware/fastcgi/fcgiclient_test.go
View File

@ -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 package fastcgi
import ( import (
@ -185,7 +191,7 @@ func generateRandFile(size int) (p string, m string) {
return return
} }
func Test(t *testing.T) { func Disabled_Test(t *testing.T) {
// TODO: test chunked reader // TODO: test chunked reader
t_ = t t_ = t