fix fakeIPSet ut error

This commit is contained in:
m1093782566 2017-11-19 12:39:43 +08:00
parent fbf8a13376
commit 268da85445

View File

@ -52,6 +52,15 @@ func (fake *fakeIPTablesVersioner) GetVersion() (string, error) {
return fake.version, fake.err return fake.version, fake.err
} }
type fakeIPSetVersioner struct {
version string // what to return
err error // what to return
}
func (fake *fakeIPSetVersioner) GetVersion() (string, error) {
return fake.version, fake.err
}
type fakeKernelCompatTester struct { type fakeKernelCompatTester struct {
ok bool ok bool
} }
@ -72,8 +81,10 @@ func Test_getProxyMode(t *testing.T) {
annotationKey string annotationKey string
annotationVal string annotationVal string
iptablesVersion string iptablesVersion string
ipsetVersion string
kernelCompat bool kernelCompat bool
iptablesError error iptablesError error
ipsetError error
expected string expected string
}{ }{
{ // flag says userspace { // flag says userspace
@ -128,7 +139,8 @@ func Test_getProxyMode(t *testing.T) {
for i, c := range cases { for i, c := range cases {
versioner := &fakeIPTablesVersioner{c.iptablesVersion, c.iptablesError} versioner := &fakeIPTablesVersioner{c.iptablesVersion, c.iptablesError}
kcompater := &fakeKernelCompatTester{c.kernelCompat} kcompater := &fakeKernelCompatTester{c.kernelCompat}
r := getProxyMode(c.flag, versioner, kcompater) ipsetver := &fakeIPSetVersioner{c.ipsetVersion, c.ipsetError}
r := getProxyMode(c.flag, versioner, ipsetver, kcompater)
if r != c.expected { if r != c.expected {
t.Errorf("Case[%d] Expected %q, got %q", i, c.expected, r) t.Errorf("Case[%d] Expected %q, got %q", i, c.expected, r)
} }