Commit a1b87219 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 3a5f3a45
...@@ -76,11 +76,6 @@ type NEOPySrv struct { ...@@ -76,11 +76,6 @@ type NEOPySrv struct {
errExit error // error from Wait errExit error // error from Wait
masterAddr string // address of master in spawned cluster masterAddr string // address of master in spawned cluster
// CA/Cert/Key used for SSL exchange. Empty if SSL is not used
CA string
Cert string
Key string
} }
func (_ *NEOPySrv) Bugs() []string { func (_ *NEOPySrv) Bugs() []string {
...@@ -309,7 +304,7 @@ func (n *NEOGoSrv) URL() string { ...@@ -309,7 +304,7 @@ func (n *NEOGoSrv) URL() string {
const npytests = "../../neo/tests/" const npytests = "../../neo/tests/"
// CA/Cert/Key files to use if opt.SSL=y // CA/Cert/Key files to use if opt.SSL=y; empty if SSL=n.
func (opt NEOSrvOptions) CA() string { func (opt NEOSrvOptions) CA() string {
if !opt.SSL { return "" } if !opt.SSL { return "" }
return npytests + "ca.crt" return npytests + "ca.crt"
...@@ -399,9 +394,9 @@ func withNEOSrv(t *testing.T, f func(t *testing.T, nsrv NEOSrv), optv ...tOption ...@@ -399,9 +394,9 @@ func withNEOSrv(t *testing.T, f func(t *testing.T, nsrv NEOSrv), optv ...tOption
"-c", npy.ClusterName(), "-c", npy.ClusterName(),
) )
if ssl { if ssl {
cmd.Args = append(cmd.Args, "--ca", npy.CA) cmd.Args = append(cmd.Args, "--ca", neoOpt.CA())
cmd.Args = append(cmd.Args, "--cert", npy.Cert) cmd.Args = append(cmd.Args, "--cert", neoOpt.Cert())
cmd.Args = append(cmd.Args, "--key", npy.Key) cmd.Args = append(cmd.Args, "--key", neoOpt.Key())
} }
cmd.Args = append(cmd.Args, cmd.Args = append(cmd.Args,
opt.Preload, opt.Preload,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment