projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18874: Fix wb2 install/boot to accommodate readonly source tree.
[arvados.git]
/
lib
/
controller
/
rails_restart_test.go
diff --git
a/lib/controller/rails_restart_test.go
b/lib/controller/rails_restart_test.go
index bb307d32160cd2f9ff3d679f0b9da9a1a9ba99c9..e3267c220f25ed776d14093dfef9d2dd508e2c26 100644
(file)
--- a/
lib/controller/rails_restart_test.go
+++ b/
lib/controller/rails_restart_test.go
@@
-75,15
+75,19
@@
func (s *railsRestartSuite) TestConfigReload(c *check.C) {
// Wait for RailsAPI's 1 Hz reload_config thread to poll and
// hit restart.txt
// Wait for RailsAPI's 1 Hz reload_config thread to poll and
// hit restart.txt
- for deadline := time.Now().Add(10 * time.Second); time.Now().Before(deadline); time.Sleep(time.Second) {
+ pollstart := time.Now()
+ for deadline := time.Now().Add(20 * time.Second); time.Now().Before(deadline); time.Sleep(time.Second) {
resp, err = hc.Do(req)
c.Assert(err, check.IsNil)
resp, err = hc.Do(req)
c.Assert(err, check.IsNil)
+ defer resp.Body.Close()
c.Check(resp.StatusCode, check.Equals, http.StatusOK)
body, err = ioutil.ReadAll(resp.Body)
c.Assert(err, check.IsNil)
c.Check(resp.StatusCode, check.Equals, http.StatusOK)
body, err = ioutil.ReadAll(resp.Body)
c.Assert(err, check.IsNil)
+ resp.Body.Close()
if strings.Contains(string(body), newhash) {
break
}
}
if strings.Contains(string(body), newhash) {
break
}
}
+ c.Logf("waited %s for rails to restart", time.Now().Sub(pollstart))
c.Check(string(body), check.Matches, `(?ms).*`+newhash+`.*`)
}
c.Check(string(body), check.Matches, `(?ms).*`+newhash+`.*`)
}