@@ -53,6 +53,8 @@ const (
5353
5454var (
5555defaultPGParameters = cluster.PGParameters {"log_destination" :"stderr" ,"logging_collector" :"false" }
56+
57+ defaultStoreTimeout = 1 * time .Second
5658)
5759
5860var curPort = MinPort
@@ -806,7 +808,6 @@ func (tp *TestProxy) WaitListening(timeout time.Duration) error {
806808if err == nil {
807809return nil
808810}
809- tp .t .Logf ("tp: %v, error: %v" ,tp .uid ,err )
810811time .Sleep (sleepInterval )
811812}
812813return fmt .Errorf ("timeout" )
@@ -824,7 +825,6 @@ func (tp *TestProxy) WaitNotListening(timeout time.Duration) error {
824825if err != nil {
825826return nil
826827}
827- tp .t .Logf ("tp: %v, error: %v" ,tp .uid ,err )
828828time .Sleep (sleepInterval )
829829}
830830return fmt .Errorf ("timeout" )
@@ -1073,7 +1073,9 @@ func NewTestConsul(t *testing.T, dir string, a ...string) (*TestStore, error) {
10731073func (ts * TestStore )WaitUp (timeout time.Duration )error {
10741074start := time .Now ()
10751075for time .Now ().Add (- timeout ).Before (start ) {
1076- _ ,err := ts .store .Get (context .TODO (),"anykey" )
1076+ ctx ,cancel := context .WithTimeout (context .Background (),defaultStoreTimeout )
1077+ _ ,err := ts .store .Get (ctx ,"anykey" )
1078+ cancel ()
10771079ts .t .Logf ("err: %v" ,err )
10781080if err != nil && err == store .ErrKeyNotFound {
10791081return nil
@@ -1090,7 +1092,9 @@ func (ts *TestStore) WaitUp(timeout time.Duration) error {
10901092func (ts * TestStore )WaitDown (timeout time.Duration )error {
10911093start := time .Now ()
10921094for time .Now ().Add (- timeout ).Before (start ) {
1093- _ ,err := ts .store .Get (context .TODO (),"anykey" )
1095+ ctx ,cancel := context .WithTimeout (context .Background (),defaultStoreTimeout )
1096+ _ ,err := ts .store .Get (ctx ,"anykey" )
1097+ cancel ()
10941098if err != nil && err != store .ErrKeyNotFound {
10951099return nil
10961100}