-
-
Notifications
You must be signed in to change notification settings - Fork 479
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: implement new MultiStrategy design
design: #559 - add: Strategy#Timeout - add: MultiStrategy#WithDeadline - add: NopStrategy & NopStrategyTarget - deprecate: MultiStrategy#WithStartupTimeout
- Loading branch information
Showing
11 changed files
with
303 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
package wait | ||
|
||
import ( | ||
"bytes" | ||
"context" | ||
"errors" | ||
"io" | ||
"testing" | ||
"time" | ||
) | ||
|
||
func TestMultiStrategy_WaitUntilReady(t *testing.T) { | ||
t.Parallel() | ||
type args struct { | ||
ctx context.Context | ||
target StrategyTarget | ||
} | ||
tests := []struct { | ||
name string | ||
strategy Strategy | ||
args args | ||
wantErr bool | ||
}{ | ||
{ | ||
name: "WithDeadline sets context Deadline for WaitStrategy", | ||
strategy: ForAll( | ||
ForNop( | ||
func(ctx context.Context, target StrategyTarget) error { | ||
if _, set := ctx.Deadline(); !set { | ||
return errors.New("expected context.Deadline to be set") | ||
} | ||
return nil | ||
}, | ||
), | ||
ForLog("docker"), | ||
).WithDeadline(1 * time.Second), | ||
args: args{ | ||
ctx: context.Background(), | ||
target: NopStrategyTarget{ | ||
ReaderCloser: io.NopCloser(bytes.NewReader([]byte("docker"))), | ||
}, | ||
}, | ||
wantErr: false, | ||
}, | ||
{ | ||
name: "WithStartupTimeoutDefault skips setting context.Deadline when WaitStrategy.Timeout is defined", | ||
strategy: ForAll( | ||
ForNop( | ||
func(ctx context.Context, target StrategyTarget) error { | ||
if _, set := ctx.Deadline(); set { | ||
return errors.New("unexpected context.Deadline to be set") | ||
} | ||
return nil | ||
}, | ||
).WithStartupTimeout(2*time.Second), | ||
ForLog("docker"), | ||
).WithStartupTimeoutDefault(1 * time.Second), | ||
args: args{ | ||
ctx: context.Background(), | ||
target: NopStrategyTarget{ | ||
ReaderCloser: io.NopCloser(bytes.NewReader([]byte("docker"))), | ||
}, | ||
}, | ||
wantErr: false, | ||
}, | ||
{ | ||
name: "WithStartupTimeoutDefault sets context.Deadline for nil WaitStrategy.Timeout", | ||
strategy: ForAll( | ||
ForNop( | ||
func(ctx context.Context, target StrategyTarget) error { | ||
if _, set := ctx.Deadline(); !set { | ||
return errors.New("expected context.Deadline to be set") | ||
} | ||
return nil | ||
}, | ||
), | ||
ForLog("docker"), | ||
).WithStartupTimeoutDefault(1 * time.Second), | ||
args: args{ | ||
ctx: context.Background(), | ||
target: NopStrategyTarget{ | ||
ReaderCloser: io.NopCloser(bytes.NewReader([]byte("docker"))), | ||
}, | ||
}, | ||
wantErr: false, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
tt := tt | ||
t.Run(tt.name, func(t *testing.T) { | ||
t.Parallel() | ||
if err := tt.strategy.WaitUntilReady(tt.args.ctx, tt.args.target); (err != nil) != tt.wantErr { | ||
t.Errorf("ForAll.WaitUntilReady() error = %v, wantErr = %v", err, tt.wantErr) | ||
} | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.