Conflicts were resolved

Signed-off-by: Tigran Manasyan <tigran.manasyan@xored.com>
networkservicemesh · Nov 24, 2020 · 0633056 · 0633056
1 parent 57875b3
commit 0633056
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/basic_suite_test.go b/basic_suite_test.go
@@ -67,7 +67,7 @@ func (s *BasicTestsSuite) TearDownSuite() {
 }
 
 func (s *BasicTestsSuite) TearDownTest() {
-	k8s.ShowLogs(s.options...)
+	k8s.ShowLogs(defaultNamespace, s.options...)
 }
 
 func (s *BasicTestsSuite) TestDeployAlpine() {

diff --git a/k8s/k8s.go b/k8s/k8s.go
@@ -162,6 +162,7 @@ func WaitLogsMatch(labelSelector, pattern, namespace string, timeout time.Durati
 		}
 		time.Sleep(time.Millisecond * 100)
 	}
+}
 
 // ApplyDaemonSet is analogy of 'kubeclt apply -f path' but with mutating daemonSet before apply
 func ApplyDaemonSet(path string, mutators ...func(deployment *apiv1.DaemonSet)) error {
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		time.Sleep(time.Millisecond * 100)
     	}
+    }
     // ApplyDaemonSet is analogy of 'kubeclt apply -f path' but with mutating daemonSet before apply
     func ApplyDaemonSet(path string, mutators ...func(deployment *apiv1.DaemonSet)) error {
@@ Expand Down @@