X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/df9e166a5ffc4aa79658bec1a5d552a3b413f0d8..72d7d41944006d1f48f570784dafe56b9812b0c8:/sdk/go/arvadostest/run_servers.go diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go index cad16917db..8f70c5ee26 100644 --- a/sdk/go/arvadostest/run_servers.go +++ b/sdk/go/arvadostest/run_servers.go @@ -1,44 +1,47 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: Apache-2.0 + package arvadostest import ( - "bufio" - "bytes" + "crypto/tls" "fmt" - "io" "io/ioutil" "log" + "net/http" "os" "os/exec" + "path" + "strconv" "strings" + + "gopkg.in/check.v1" ) var authSettings = make(map[string]string) +// ResetEnv resets ARVADOS_* env vars to whatever they were the first +// time this func was called. +// +// Call it from your SetUpTest or SetUpSuite func if your tests modify +// env vars. func ResetEnv() { - for k, v := range authSettings { - os.Setenv(k, v) - } -} - -func ParseAuthSettings(authScript []byte) { - scanner := bufio.NewScanner(bytes.NewReader(authScript)) - for scanner.Scan() { - line := scanner.Text() - if 0 != strings.Index(line, "export ") { - log.Printf("Ignoring: %v", line) - continue + if len(authSettings) == 0 { + for _, e := range os.Environ() { + e := strings.SplitN(e, "=", 2) + if len(e) == 2 { + authSettings[e[0]] = e[1] + } } - toks := strings.SplitN(strings.Replace(line, "export ", "", 1), "=", 2) - if len(toks) == 2 { - authSettings[toks[0]] = toks[1] - } else { - log.Fatalf("Could not parse: %v", line) + } else { + for k, v := range authSettings { + os.Setenv(k, v) } } - log.Printf("authSettings: %v", authSettings) } -var pythonTestDir string = "" +var pythonTestDir string func chdirToPythonTests() { if pythonTestDir != "" { @@ -50,6 +53,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,63 +67,82 @@ func chdirToPythonTests() { } } -func StartAPI() { +func ResetDB(c *check.C) { + hc := http.Client{Transport: &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + }} + req, err := http.NewRequest("POST", "https://"+os.Getenv("ARVADOS_TEST_API_HOST")+"/database/reset", nil) + c.Assert(err, check.IsNil) + req.Header.Set("Authorization", "Bearer "+AdminToken) + resp, err := hc.Do(req) + c.Assert(err, check.IsNil) + defer resp.Body.Close() + c.Check(resp.StatusCode, check.Equals, http.StatusOK) +} + +// 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", "--auth", "admin") - stderr, err := cmd.StderrPipe() - if err != nil { - log.Fatal(err) - } - go io.Copy(os.Stderr, stderr) - stdout, err := cmd.StdoutPipe() - if err != nil { - log.Fatal(err) - } - if err = cmd.Start(); err != nil { - log.Fatal(err) + cmdArgs := []string{"run_test_server.py", "start_keep", "--num-keep-servers", strconv.Itoa(numKeepServers)} + if blobSigning { + cmdArgs = append(cmdArgs, "--keep-blob-signing") } - var authScript []byte - if authScript, err = ioutil.ReadAll(stdout); err != nil { - log.Fatal(err) - } - if err = cmd.Wait(); err != nil { - log.Fatal(err) - } - ParseAuthSettings(authScript) - ResetEnv() + + bgRun(exec.Command("python", cmdArgs...)) } -func StopAPI() { +// 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").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() } -func StartKeep() { - cwd, _ := os.Getwd() - defer os.Chdir(cwd) - chdirToPythonTests() - - cmd := exec.Command("python", "run_test_server.py", "start_keep") - stderr, err := cmd.StderrPipe() - if err != nil { - log.Fatalf("Setting up stderr pipe: %s", err) +// 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) } - 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)) + if _, err := cmd.Process.Wait(); err != nil { + log.Fatalf("%+v: %s", cmd.Args, err) } } -func StopKeep() { - cwd, _ := os.Getwd() - defer os.Chdir(cwd) - chdirToPythonTests() +// 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 +} - exec.Command("python", "run_test_server.py", "stop_keep").Run() +// 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 }