projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15003: Fix import cycle.
[arvados.git]
/
services
/
keep-web
/
server_test.go
diff --git
a/services/keep-web/server_test.go
b/services/keep-web/server_test.go
index 8b689efbdc1f1d731bc2a9dfb106c12e3c214cef..a9830bc1de4715d2cfdaa39049106bcf95cce779 100644
(file)
--- a/
services/keep-web/server_test.go
+++ b/
services/keep-web/server_test.go
@@
-266,9
+266,10
@@
func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ...
c.Log(fmt.Sprintf("curlArgs == %#v", curlArgs))
cmd := exec.Command("curl", curlArgs...)
stdout, err := cmd.StdoutPipe()
c.Log(fmt.Sprintf("curlArgs == %#v", curlArgs))
cmd := exec.Command("curl", curlArgs...)
stdout, err := cmd.StdoutPipe()
- c.Assert(err, check.Equals, nil)
- cmd.Stderr = cmd.Stdout
- go cmd.Start()
+ c.Assert(err, check.IsNil)
+ cmd.Stderr = os.Stderr
+ err = cmd.Start()
+ c.Assert(err, check.IsNil)
buf := make([]byte, 2<<27)
n, err := io.ReadFull(stdout, buf)
// Discard (but measure size of) anything past 128 MiB.
buf := make([]byte, 2<<27)
n, err := io.ReadFull(stdout, buf)
// Discard (but measure size of) anything past 128 MiB.
@@
-276,9
+277,9
@@
func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ...
if err == io.ErrUnexpectedEOF {
buf = buf[:n]
} else {
if err == io.ErrUnexpectedEOF {
buf = buf[:n]
} else {
- c.Assert(err, check.
Equals, n
il)
+ c.Assert(err, check.
IsN
il)
discarded, err = io.Copy(ioutil.Discard, stdout)
discarded, err = io.Copy(ioutil.Discard, stdout)
- c.Assert(err, check.
Equals, n
il)
+ c.Assert(err, check.
IsN
il)
}
err = cmd.Wait()
// Without "-f", curl exits 0 as long as it gets a valid HTTP
}
err = cmd.Wait()
// Without "-f", curl exits 0 as long as it gets a valid HTTP