From 696d7014222b22cfa50643fb54e07848d68dcca4 Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Mon, 26 Mar 2018 18:57:14 -0400 Subject: [PATCH] clear state of global service/endpoint watcher in Test_addExportPolicies (#353) --- .../network_routes_controller_test.go | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/controllers/network_routes_controller_test.go b/app/controllers/network_routes_controller_test.go index 5e660547..34a703f6 100644 --- a/app/controllers/network_routes_controller_test.go +++ b/app/controllers/network_routes_controller_test.go @@ -1198,10 +1198,6 @@ func Test_addExportPolicies(t *testing.T) { IpPrefix: "1.1.1.1/32", MasklengthRange: "32..32", }, - { - IpPrefix: "2.2.2.2/32", - MasklengthRange: "32..32", - }, { IpPrefix: "10.0.0.1/32", MasklengthRange: "32..32", @@ -1306,10 +1302,6 @@ func Test_addExportPolicies(t *testing.T) { IpPrefix: "1.1.1.1/32", MasklengthRange: "32..32", }, - { - IpPrefix: "2.2.2.2/32", - MasklengthRange: "32..32", - }, { IpPrefix: "10.0.0.1/32", MasklengthRange: "32..32", @@ -1381,6 +1373,16 @@ func Test_addExportPolicies(t *testing.T) { } 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 { 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) } - // ClusterIPs and ExternalIPs testcase.nrc.advertiseClusterIp = true testcase.nrc.advertiseExternalIp = true testcase.nrc.advertiseLoadBalancerIp = false + + waitForListerWithTimeout(time.Second*10, t) + err = testcase.nrc.addExportPolicies() if !reflect.DeepEqual(err, testcase.err) { t.Logf("expected err %v", testcase.err)