clear state of global service/endpoint watcher in Test_addExportPolicies (#353)

This commit is contained in:
Andrew Sy Kim 2018-03-26 18:57:14 -04:00 committed by GitHub
parent bf5c11ff02
commit 696d701422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1198,10 +1198,6 @@ func Test_addExportPolicies(t *testing.T) {
IpPrefix: "1.1.1.1/32", IpPrefix: "1.1.1.1/32",
MasklengthRange: "32..32", MasklengthRange: "32..32",
}, },
{
IpPrefix: "2.2.2.2/32",
MasklengthRange: "32..32",
},
{ {
IpPrefix: "10.0.0.1/32", IpPrefix: "10.0.0.1/32",
MasklengthRange: "32..32", MasklengthRange: "32..32",
@ -1306,10 +1302,6 @@ func Test_addExportPolicies(t *testing.T) {
IpPrefix: "1.1.1.1/32", IpPrefix: "1.1.1.1/32",
MasklengthRange: "32..32", MasklengthRange: "32..32",
}, },
{
IpPrefix: "2.2.2.2/32",
MasklengthRange: "32..32",
},
{ {
IpPrefix: "10.0.0.1/32", IpPrefix: "10.0.0.1/32",
MasklengthRange: "32..32", MasklengthRange: "32..32",
@ -1381,6 +1373,16 @@ func Test_addExportPolicies(t *testing.T) {
} }
defer testcase.nrc.bgpServer.Stop() defer testcase.nrc.bgpServer.Stop()
_, err = watchers.StartServiceWatcher(testcase.nrc.clientset, 0)
if err != nil {
t.Fatalf("failed to initialize service watcher %v", err)
}
_, err = watchers.StartEndpointsWatcher(testcase.nrc.clientset, 0)
if err != nil {
t.Fatalf("failed to initialize endpoints watcher %v", err)
}
if err = createNodes(testcase.nrc.clientset, testcase.existingNodes); err != nil { if err = createNodes(testcase.nrc.clientset, testcase.existingNodes); err != nil {
t.Errorf("failed to create existing nodes: %v", err) t.Errorf("failed to create existing nodes: %v", err)
} }
@ -1389,10 +1391,12 @@ func Test_addExportPolicies(t *testing.T) {
t.Errorf("failed to create existing nodes: %v", err) t.Errorf("failed to create existing nodes: %v", err)
} }
// ClusterIPs and ExternalIPs
testcase.nrc.advertiseClusterIp = true testcase.nrc.advertiseClusterIp = true
testcase.nrc.advertiseExternalIp = true testcase.nrc.advertiseExternalIp = true
testcase.nrc.advertiseLoadBalancerIp = false testcase.nrc.advertiseLoadBalancerIp = false
waitForListerWithTimeout(time.Second*10, t)
err = testcase.nrc.addExportPolicies() err = testcase.nrc.addExportPolicies()
if !reflect.DeepEqual(err, testcase.err) { if !reflect.DeepEqual(err, testcase.err) {
t.Logf("expected err %v", testcase.err) t.Logf("expected err %v", testcase.err)