diff options
Diffstat (limited to 'tests/plugins')
-rw-r--r-- | tests/plugins/http/configs/.rr-fcgi-reqUri.yaml | 2 | ||||
-rw-r--r-- | tests/plugins/http/configs/.rr-fcgi.yaml | 2 | ||||
-rw-r--r-- | tests/plugins/http/configs/.rr-init.yaml | 2 | ||||
-rw-r--r-- | tests/plugins/http/configs/.rr-ssl-push.yaml | 2 | ||||
-rw-r--r-- | tests/plugins/http/configs/.rr-ssl-redirect.yaml | 2 | ||||
-rw-r--r-- | tests/plugins/http/configs/.rr-ssl.yaml | 2 | ||||
-rw-r--r-- | tests/plugins/http/http_plugin_test.go | 8 | ||||
-rwxr-xr-x | tests/plugins/rpc/config_test.go | 1 |
8 files changed, 10 insertions, 11 deletions
diff --git a/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml b/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml index 99002777..05c3d40a 100644 --- a/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml +++ b/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml @@ -22,7 +22,7 @@ http: destroy_timeout: 60s ssl: - port: 8890 + address: :8890 redirect: false cert: fixtures/server.crt key: fixtures/server.key diff --git a/tests/plugins/http/configs/.rr-fcgi.yaml b/tests/plugins/http/configs/.rr-fcgi.yaml index 110b68f4..cfd4b79b 100644 --- a/tests/plugins/http/configs/.rr-fcgi.yaml +++ b/tests/plugins/http/configs/.rr-fcgi.yaml @@ -22,7 +22,7 @@ http: destroy_timeout: 60s ssl: - port: 8889 + address: :8889 redirect: false cert: fixtures/server.crt key: fixtures/server.key diff --git a/tests/plugins/http/configs/.rr-init.yaml b/tests/plugins/http/configs/.rr-init.yaml index b541e6de..01b90b44 100644 --- a/tests/plugins/http/configs/.rr-init.yaml +++ b/tests/plugins/http/configs/.rr-init.yaml @@ -26,7 +26,7 @@ http: destroy_timeout: 60s ssl: - port: 8892 + address: :8892 redirect: false cert: fixtures/server.crt key: fixtures/server.key diff --git a/tests/plugins/http/configs/.rr-ssl-push.yaml b/tests/plugins/http/configs/.rr-ssl-push.yaml index ae9fbc02..11a8ddd3 100644 --- a/tests/plugins/http/configs/.rr-ssl-push.yaml +++ b/tests/plugins/http/configs/.rr-ssl-push.yaml @@ -22,7 +22,7 @@ http: destroy_timeout: 60s ssl: - port: 8894 + address: :8894 redirect: true cert: fixtures/server.crt key: fixtures/server.key diff --git a/tests/plugins/http/configs/.rr-ssl-redirect.yaml b/tests/plugins/http/configs/.rr-ssl-redirect.yaml index d052e649..e49a73ed 100644 --- a/tests/plugins/http/configs/.rr-ssl-redirect.yaml +++ b/tests/plugins/http/configs/.rr-ssl-redirect.yaml @@ -22,7 +22,7 @@ http: destroy_timeout: 60s ssl: - port: 8895 + address: :8895 redirect: true cert: fixtures/server.crt key: fixtures/server.key diff --git a/tests/plugins/http/configs/.rr-ssl.yaml b/tests/plugins/http/configs/.rr-ssl.yaml index c3e45365..8a0f16b8 100644 --- a/tests/plugins/http/configs/.rr-ssl.yaml +++ b/tests/plugins/http/configs/.rr-ssl.yaml @@ -21,7 +21,7 @@ http: destroy_timeout: 60s ssl: - port: 8893 + address: :8893 redirect: false cert: fixtures/server.crt key: fixtures/server.key diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go index 23628c72..72ae05a0 100644 --- a/tests/plugins/http/http_plugin_test.go +++ b/tests/plugins/http/http_plugin_test.go @@ -46,7 +46,7 @@ func TestHTTPInit(t *testing.T) { cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel)) assert.NoError(t, err) - rIn := makeConfig("6001", "15395", "7921", "8892", "false", "false", "php ../../http/client.php echo pipes") + rIn := makeConfig("6001", "15395", "7921", ":8892", "false", "false", "php ../../http/client.php echo pipes") cfg := &config.Viper{ ReadInCfg: rIn, Type: "yaml", @@ -1264,7 +1264,7 @@ func getHeader(url string, h map[string]string) (string, *http.Response, error) return string(b), r, err } -func makeConfig(rpcPort, httpPort, fcgiPort, sslPort, redirect, http2Enabled, command string) []byte { +func makeConfig(rpcPort, httpPort, fcgiPort, sslAddress, redirect, http2Enabled, command string) []byte { return []byte(fmt.Sprintf(` rpc: listen: tcp://127.0.0.1:%s @@ -1293,7 +1293,7 @@ http: destroyTimeout: 60s ssl: - port: %s + address: %s redirect: %s cert: fixtures/server.crt key: fixtures/server.key @@ -1307,5 +1307,5 @@ http: logs: mode: development level: error -`, rpcPort, command, httpPort, sslPort, redirect, fcgiPort, http2Enabled)) +`, rpcPort, command, httpPort, sslAddress, redirect, fcgiPort, http2Enabled)) } diff --git a/tests/plugins/rpc/config_test.go b/tests/plugins/rpc/config_test.go index df5fa391..34ca9cee 100755 --- a/tests/plugins/rpc/config_test.go +++ b/tests/plugins/rpc/config_test.go @@ -51,7 +51,6 @@ func Test_Config_Error(t *testing.T) { ln, err := cfg.Listener() assert.Nil(t, ln) assert.Error(t, err) - assert.Equal(t, "invalid DSN (tcp://:6001, unix://file.sock)", err.Error()) } func Test_Config_ErrorMethod(t *testing.T) { |