Merge pull request #487 from fosterseth/fix_stabilize_tests_devel

Make tests more stable by extending context timeout

.golangci.yml

@@ -69,6 +69,7 @@ linters:
     # - wrapcheck # TODO: Errors passed upwards should be wrapped.
 
 issues:
+  fix: true
   exclude:
     - "lostcancel" # TODO: Context is not canceled on multiple occasions. Needs more detailed work to be fixed.
     - "SA2002|thelper|testinggoroutine" # TODO: Test interface used outside of its routine, tests need to be rewritten.

tests/functional/lib/mesh/climesh.go

@@ -83,11 +83,11 @@ func (n *CLINode) Start() error {
 	nodedefPath := filepath.Join(n.dir, "nodedef.yaml")
 	ioutil.WriteFile(nodedefPath, strData, 0o644)
 	n.receptorCmd = exec.Command("receptor", "--config", nodedefPath)
-	stdout, err := os.Create(filepath.Join(n.dir, "stdout"))
+	stdout, err := os.OpenFile(filepath.Join(n.dir, "stdout"), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o600)
 	if err != nil {
 		return err
 	}
-	stderr, err := os.Create(filepath.Join(n.dir, "stderr"))
+	stderr, err := os.OpenFile(filepath.Join(n.dir, "stderr"), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o600)
 	if err != nil {
 		return err
 	}
@@ -654,7 +654,7 @@ func (m *CLIMesh) CheckControlSockets() bool {
 
 // WaitForReady Waits for connections and routes to converge.
 func (m *CLIMesh) WaitForReady(ctx context.Context) error {
-	sleepInterval := 100 * time.Millisecond
+	sleepInterval := 500 * time.Millisecond
 	if !utils.CheckUntilTimeout(ctx, sleepInterval, m.CheckControlSockets) {
 		return errors.New("timed out while waiting for control sockets")
 	}