X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a717f156747bb997bd9e9cefe1919c8e53c28c4b..42bf31f017a009585eaac2fe44a83b2596b3e5c8:/sdk/go/arvadostest/run_servers.go

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index a175136164..5b01db5c4b 100644
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -1,25 +1,41 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvadostest
 
 import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
+	"path"
+	"strconv"
 	"strings"
 )
 
 var authSettings = make(map[string]string)
 
+// ResetEnv resets test env
 func ResetEnv() {
 	for k, v := range authSettings {
 		os.Setenv(k, v)
 	}
 }
 
+// APIHost returns the address:port of the current test server.
+func APIHost() string {
+	h := authSettings["ARVADOS_API_HOST"]
+	if h == "" {
+		log.Fatal("arvadostest.APIHost() was called but authSettings is not populated")
+	}
+	return h
+}
+
+// ParseAuthSettings parses auth settings from given input
 func ParseAuthSettings(authScript []byte) {
 	scanner := bufio.NewScanner(bytes.NewReader(authScript))
 	for scanner.Scan() {
@@ -38,7 +54,7 @@ func ParseAuthSettings(authScript []byte) {
 	log.Printf("authSettings: %v", authSettings)
 }
 
-var pythonTestDir string = ""
+var pythonTestDir string
 
 func chdirToPythonTests() {
 	if pythonTestDir != "" {
@@ -50,6 +66,9 @@ func chdirToPythonTests() {
 	for {
 		if err := os.Chdir("sdk/python/tests"); err == nil {
 			pythonTestDir, err = os.Getwd()
+			if err != nil {
+				log.Fatal(err)
+			}
 			return
 		}
 		if parent, err := os.Getwd(); err != nil || parent == "/" {
@@ -61,70 +80,99 @@ func chdirToPythonTests() {
 	}
 }
 
+// StartAPI starts test API server
 func StartAPI() {
 	cwd, _ := os.Getwd()
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
 
 	cmd := exec.Command("python", "run_test_server.py", "start", "--auth", "admin")
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		log.Fatal(err)
-	}
-	go io.Copy(os.Stderr, stderr)
-	stdout, err := cmd.StdoutPipe()
+	cmd.Stdin = nil
+	cmd.Stderr = os.Stderr
+
+	authScript, err := cmd.Output()
 	if err != nil {
-		log.Fatal(err)
-	}
-	if err = cmd.Start(); err != nil {
-		log.Fatal(err)
-	}
-	var authScript []byte
-	if authScript, err = ioutil.ReadAll(stdout); err != nil {
-		log.Fatal(err)
-	}
-	if err = cmd.Wait(); err != nil {
-		log.Fatal(err)
+		log.Fatalf("%+v: %s", cmd.Args, err)
 	}
 	ParseAuthSettings(authScript)
 	ResetEnv()
 }
 
+// StopAPI stops test API server
 func StopAPI() {
 	cwd, _ := os.Getwd()
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
 
-	exec.Command("python", "run_test_server.py", "stop").Run()
+	cmd := exec.Command("python", "run_test_server.py", "stop")
+	bgRun(cmd)
+	// Without Wait, "go test" in go1.10.1 tends to hang. https://github.com/golang/go/issues/24050
+	cmd.Wait()
 }
 
-func StartKeep() {
-	StartKeepAdditional(false)
-}
-
-func StartKeepAdditional(keepExisting bool) {
+// StartKeep starts the given number of keep servers,
+// optionally with --keep-blob-signing enabled.
+// Use numKeepServers = 2 and blobSigning = false under all normal circumstances.
+func StartKeep(numKeepServers int, blobSigning bool) {
 	cwd, _ := os.Getwd()
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
 
-	cmd := exec.Command("python", "run_test_server.py", "start_keep")
-	if keepExisting {
-		cmd = exec.Command("python", "run_test_server.py", "start_keep", "--keep_existing", "true")
-	}
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		log.Fatalf("Setting up stderr pipe: %s", err)
-	}
-	go io.Copy(os.Stderr, stderr)
-	if err := cmd.Run(); err != nil {
-		panic(fmt.Sprintf("'python run_test_server.py start_keep' returned error %s", err))
+	cmdArgs := []string{"run_test_server.py", "start_keep", "--num-keep-servers", strconv.Itoa(numKeepServers)}
+	if blobSigning {
+		cmdArgs = append(cmdArgs, "--keep-blob-signing")
 	}
+
+	bgRun(exec.Command("python", cmdArgs...))
 }
 
-func StopKeep() {
+// StopKeep stops keep servers that were started with StartKeep.
+// numkeepServers should be the same value that was passed to StartKeep,
+// which is 2 under all normal circumstances.
+func StopKeep(numKeepServers int) {
 	cwd, _ := os.Getwd()
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
 
-	exec.Command("python", "run_test_server.py", "stop_keep").Run()
+	cmd := exec.Command("python", "run_test_server.py", "stop_keep", "--num-keep-servers", strconv.Itoa(numKeepServers))
+	bgRun(cmd)
+	// Without Wait, "go test" in go1.10.1 tends to hang. https://github.com/golang/go/issues/24050
+	cmd.Wait()
+}
+
+// Start cmd, with stderr and stdout redirected to our own
+// stderr. Return when the process exits, but do not wait for its
+// stderr and stdout to close: any grandchild processes will continue
+// writing to our stderr.
+func bgRun(cmd *exec.Cmd) {
+	cmd.Stdin = nil
+	cmd.Stderr = os.Stderr
+	cmd.Stdout = os.Stderr
+	if err := cmd.Start(); err != nil {
+		log.Fatalf("%+v: %s", cmd.Args, err)
+	}
+	if _, err := cmd.Process.Wait(); err != nil {
+		log.Fatalf("%+v: %s", cmd.Args, err)
+	}
+}
+
+// CreateBadPath creates a tmp dir, appends given string and returns that path
+// This will guarantee that the path being returned does not exist
+func CreateBadPath() (badpath string, err error) {
+	tempdir, err := ioutil.TempDir("", "bad")
+	if err != nil {
+		return "", fmt.Errorf("Could not create temporary directory for bad path: %v", err)
+	}
+	badpath = path.Join(tempdir, "bad")
+	return badpath, nil
+}
+
+// DestroyBadPath deletes the tmp dir created by the previous CreateBadPath call
+func DestroyBadPath(badpath string) error {
+	tempdir := path.Join(badpath, "..")
+	err := os.Remove(tempdir)
+	if err != nil {
+		return fmt.Errorf("Could not remove bad path temporary directory %v: %v", tempdir, err)
+	}
+	return nil
 }