Skip to content

Implement an optional Stage2 interface that allows such stages to be started more flexibly #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Implement an optional Stage2 interface that allows such stages to be started more flexibly #20

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ffae882
Shush the linter
mhagger Dec 17, 2023
95dc2e8
pipeline_test.go: get rid of a bunch of unnecessary tmpdirs
mhagger Dec 16, 2023
5fdc22a
TestPipelineStdinThatIsNeverClosed(): create stdin more simply
mhagger Dec 16, 2023
c2c9802
pipeline_test.go: use `WithStdoutCloser()` to close stdout pipes
mhagger Dec 16, 2023
f595c9e
Add some benchmarks of moving a bunch of data through a pipeline
mhagger Dec 16, 2023
385f6c7
Simplify the `NopCloser`s
mhagger Dec 15, 2023
6820dbb
Implement Stage2 with a more flexible way of starting stages
mhagger Dec 15, 2023
3462135
Add some tests that `Pipeline.Start()` picks the right stdin/stdout
mhagger Dec 17, 2023
413069f
Improve some names related to the new interface:
mhagger Aug 3, 2024
81487bf
Pipeline.Start(): initialize both stage preferences
mhagger Aug 3, 2024
585617b
Makefile: fix linting rule
mhagger Aug 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pipeline_test.go: get rid of a bunch of unnecessary tmpdirs
  • Loading branch information
@mhagger
mhagger committed Dec 17, 2023
commit 95dc2e8211dca6ee31b2a285645d8084961e2351
71 changes: 20 additions & 51 deletions pipe/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ func TestNontrivialPipeline(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("echo", "hello world"),
pipe.Command("sed", "s/hello/goodbye/"),
Expand Down Expand Up @@ -211,8 +209,6 @@ func TestPipelineReadFromSlowly2(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()

dir := t.TempDir()

r, w := io.Pipe()

var buf []byte
Expand All @@ -236,7 +232,7 @@ func TestPipelineReadFromSlowly2(t *testing.T) {
}
}()

p := pipe.New(pipe.WithDir(dir), pipe.WithStdout(w))
p := pipe.New(pipe.WithStdout(w))
p.Add(pipe.Command("seq", "100"))
assert.NoError(t, p.Run(ctx))

Expand All @@ -253,9 +249,7 @@ func TestPipelineTwoCommandsPiping(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(pipe.Command("echo", "hello world"))
assert.Panics(t, func() { p.Add(pipe.Command("")) })
out, err := p.Output(ctx)
Expand Down Expand Up @@ -283,9 +277,7 @@ func TestPipelineExit(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("false"),
pipe.Command("true"),
Expand Down Expand Up @@ -316,11 +308,10 @@ func TestPipelineInterrupted(t *testing.T) {
}

t.Parallel()
dir := t.TempDir()

stdout := &bytes.Buffer{}

p := pipe.New(pipe.WithDir(dir), pipe.WithStdout(stdout))
p := pipe.New(pipe.WithStdout(stdout))
p.Add(pipe.Command("sleep", "10"))

ctx, cancel := context.WithTimeout(context.Background(), 20*time.Millisecond)
Expand All @@ -339,11 +330,10 @@ func TestPipelineCanceled(t *testing.T) {
}

t.Parallel()
dir := t.TempDir()

stdout := &bytes.Buffer{}

p := pipe.New(pipe.WithDir(dir), pipe.WithStdout(stdout))
p := pipe.New(pipe.WithStdout(stdout))
p.Add(pipe.Command("sleep", "10"))

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -367,9 +357,8 @@ func TestLittleEPIPE(t *testing.T) {
}

t.Parallel()
dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("sh", "-c", "sleep 1; echo foo"),
pipe.Command("true"),
Expand All @@ -391,9 +380,8 @@ func TestBigEPIPE(t *testing.T) {
}

t.Parallel()
dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("seq", "100000"),
pipe.Command("true"),
Expand All @@ -415,9 +403,8 @@ func TestIgnoredSIGPIPE(t *testing.T) {
}

t.Parallel()
dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.IgnoreError(pipe.Command("seq", "100000"), pipe.IsSIGPIPE),
pipe.Command("echo", "foo"),
Expand All @@ -434,9 +421,7 @@ func TestFunction(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Print("hello world"),
pipe.Function(
Expand Down Expand Up @@ -464,9 +449,7 @@ func TestPipelineWithFunction(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("echo", "-n", "hello world"),
pipe.Function(
Expand Down Expand Up @@ -528,9 +511,7 @@ func TestPipelineWithLinewiseFunction(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
// Print the numbers from 1 to 20 (generated from scratch):
p.Add(
seqFunction(20),
Expand Down Expand Up @@ -581,7 +562,7 @@ func TestScannerAlwaysFlushes(t *testing.T) {

var length int64

p := pipe.New(pipe.WithDir("."))
p := pipe.New()
// Print the numbers from 1 to 20 (generated from scratch):
p.Add(
pipe.IgnoreError(
Expand Down Expand Up @@ -629,7 +610,7 @@ func TestScannerFinishEarly(t *testing.T) {

var length int64

p := pipe.New(pipe.WithDir("."))
p := pipe.New()
// Print the numbers from 1 to 20 (generated from scratch):
p.Add(
pipe.IgnoreError(
Expand Down Expand Up @@ -670,9 +651,7 @@ func TestPrintln(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(pipe.Println("Look Ma, no hands!"))
out, err := p.Output(ctx)
if assert.NoError(t, err) {
Expand All @@ -684,9 +663,7 @@ func TestPrintf(t *testing.T) {
t.Parallel()
ctx := context.Background()

dir := t.TempDir()

p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(pipe.Printf("Strangely recursive: %T", p))
out, err := p.Output(ctx)
if assert.NoError(t, err) {
Expand Down Expand Up @@ -880,10 +857,8 @@ func TestErrors(t *testing.T) {
func BenchmarkSingleProgram(b *testing.B) {
ctx := context.Background()

dir := b.TempDir()

for i := 0; i < b.N; i++ {
p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("true"),
)
Expand All @@ -894,10 +869,8 @@ func BenchmarkSingleProgram(b *testing.B) {
func BenchmarkTenPrograms(b *testing.B) {
ctx := context.Background()

dir := b.TempDir()

for i := 0; i < b.N; i++ {
p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("echo", "hello world"),
pipe.Command("cat"),
Expand All @@ -920,15 +893,13 @@ func BenchmarkTenPrograms(b *testing.B) {
func BenchmarkTenFunctions(b *testing.B) {
ctx := context.Background()

dir := b.TempDir()

cp := func(_ context.Context, _ pipe.Env, stdin io.Reader, stdout io.Writer) error {
_, err := io.Copy(stdout, stdin)
return err
}

for i := 0; i < b.N; i++ {
p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Println("hello world"),
pipe.Function("copy1", cp),
Expand All @@ -951,15 +922,13 @@ func BenchmarkTenFunctions(b *testing.B) {
func BenchmarkTenMixedStages(b *testing.B) {
ctx := context.Background()

dir := b.TempDir()

cp := func(_ context.Context, _ pipe.Env, stdin io.Reader, stdout io.Writer) error {
_, err := io.Copy(stdout, stdin)
return err
}

for i := 0; i < b.N; i++ {
p := pipe.New(pipe.WithDir(dir))
p := pipe.New()
p.Add(
pipe.Command("echo", "hello world"),
pipe.Function("copy1", cp),
Expand Down