Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32d8252e50 |
@@ -753,13 +753,11 @@ entrypoints are:
|
|||||||
- `script/lint` — run the linter. It builds `Dockerfile.lint`, which copies the
|
- `script/lint` — run the linter. It builds `Dockerfile.lint`, which copies the
|
||||||
repository into the digest-pinned `golangci/golangci-lint` image and runs
|
repository into the digest-pinned `golangci/golangci-lint` image and runs
|
||||||
`golangci-lint config verify` and `golangci-lint run` as build steps, so a
|
`golangci-lint config verify` and `golangci-lint run` as build steps, so a
|
||||||
successful build is a clean lint. That exit status is all it produces, so it
|
successful build is a clean lint. The linter is never run on the host, which
|
||||||
runs with `--output=type=cacheonly` and writes no image; a run leaves only
|
makes a working `docker` the one prerequisite for linting — and therefore for
|
||||||
build cache. The linter is never run on the host, which makes a working
|
`make check` and the pre-commit hook. Offline machines: the gate steps
|
||||||
`docker` the one prerequisite for linting — and therefore for `make check` and
|
themselves make no network calls. `golangci-lint run` does not, and neither
|
||||||
the pre-commit hook. Offline machines: the gate steps themselves make no
|
does `golangci-lint config verify` — it validates against a schema the pinned
|
||||||
network calls. `golangci-lint run` does not, and neither does
|
|
||||||
`golangci-lint config verify` — it validates against a schema the pinned
|
|
||||||
binary embeds, measured under `--network none` to both pass a valid config and
|
binary embeds, measured under `--network none` to both pass a valid config and
|
||||||
reject an invalid one. The build around them does. `Dockerfile.lint` runs
|
reject an invalid one. The build around them does. `Dockerfile.lint` runs
|
||||||
`go mod download` before the gates and this module has external dependencies,
|
`go mod download` before the gates and this module has external dependencies,
|
||||||
|
|||||||
@@ -32,13 +32,6 @@
|
|||||||
CI checks it; all Markdown reformatted (2026-10-04,
|
CI checks it; all Markdown reformatted (2026-10-04,
|
||||||
https://git.eeqj.de/sneak/sfdupes/issues/19)
|
https://git.eeqj.de/sneak/sfdupes/issues/19)
|
||||||
|
|
||||||
- `script/lint` writes no image, so a run no longer leaves an untagged one
|
|
||||||
behind (2026-10-04, https://git.eeqj.de/sneak/sfdupes/issues/48)
|
|
||||||
|
|
||||||
- tests cover a missing database, `scan` keeping stdout empty, its skip warning,
|
|
||||||
the `report` and `trees` summary lines, and every subcommand going through
|
|
||||||
`runE` (2026-10-04, https://git.eeqj.de/sneak/sfdupes/issues/16)
|
|
||||||
|
|
||||||
- `.golangci.yml` replaced with the current canonical copy, which uses
|
- `.golangci.yml` replaced with the current canonical copy, which uses
|
||||||
`gomodguard_v2`, so lint no longer prints a deprecation warning (2026-10-04,
|
`gomodguard_v2`, so lint no longer prints a deprecation warning (2026-10-04,
|
||||||
https://git.eeqj.de/sneak/sfdupes/issues/26)
|
https://git.eeqj.de/sneak/sfdupes/issues/26)
|
||||||
|
|||||||
+5
-15
@@ -344,14 +344,13 @@ func storedPaths(t *testing.T, path string) []string {
|
|||||||
|
|
||||||
// TestRunScanInterrupted calls the scan entrypoint with a context that
|
// TestRunScanInterrupted calls the scan entrypoint with a context that
|
||||||
// is already cancelled, as when a signal arrives at once. It must return
|
// is already cancelled, as when a signal arrives at once. It must return
|
||||||
// errInterrupted promptly with its one line on stderr and nothing on
|
// errInterrupted promptly with its one line on stderr, leave the
|
||||||
// stdout, leave the database valid and as it was, and leave nothing in
|
// database valid and as it was, and leave nothing in the way of the
|
||||||
// the way of the next scan, which must bring the database up to date.
|
// next scan, which must bring the database up to date.
|
||||||
func TestRunScanInterrupted(t *testing.T) {
|
func TestRunScanInterrupted(t *testing.T) {
|
||||||
path := testDBPath(t)
|
path := testDBPath(t)
|
||||||
t.Setenv(databaseEnv, path)
|
t.Setenv(databaseEnv, path)
|
||||||
|
|
||||||
stdout := captureStdout(t)
|
|
||||||
stderr := captureStderr(t)
|
stderr := captureStderr(t)
|
||||||
dir := buildSmokeTree(t)
|
dir := buildSmokeTree(t)
|
||||||
|
|
||||||
@@ -394,10 +393,6 @@ func TestRunScanInterrupted(t *testing.T) {
|
|||||||
t.Errorf("stderr = %q, want %q", got, want)
|
t.Errorf("stderr = %q, want %q", got, want)
|
||||||
}
|
}
|
||||||
|
|
||||||
if got := stdout(); got != "" {
|
|
||||||
t.Errorf("stdout = %q, want nothing (data only)", got)
|
|
||||||
}
|
|
||||||
|
|
||||||
assertNoSidecars(t, path)
|
assertNoSidecars(t, path)
|
||||||
|
|
||||||
if got := storedPaths(t, path); !slices.Equal(got, before) {
|
if got := storedPaths(t, path); !slices.Equal(got, before) {
|
||||||
@@ -420,13 +415,12 @@ func TestRunScanInterrupted(t *testing.T) {
|
|||||||
// TestRunScanInterruptedMidHash interrupts the scan entrypoint part-way
|
// TestRunScanInterruptedMidHash interrupts the scan entrypoint part-way
|
||||||
// through its hash phase, after the database is open. It must return
|
// through its hash phase, after the database is open. It must return
|
||||||
// errInterrupted, release the lock, end stderr with its line counting
|
// errInterrupted, release the lock, end stderr with its line counting
|
||||||
// every file the walk reached, write nothing to stdout, close the
|
// every file the walk reached, close the database out of WAL mode, and
|
||||||
// database out of WAL mode, and keep the records it hashed.
|
// keep the records it hashed.
|
||||||
func TestRunScanInterruptedMidHash(t *testing.T) {
|
func TestRunScanInterruptedMidHash(t *testing.T) {
|
||||||
path := testDBPath(t)
|
path := testDBPath(t)
|
||||||
t.Setenv(databaseEnv, path)
|
t.Setenv(databaseEnv, path)
|
||||||
|
|
||||||
stdout := captureStdout(t)
|
|
||||||
stderr := captureStderr(t)
|
stderr := captureStderr(t)
|
||||||
dir := buildWalkCancelTree(t)
|
dir := buildWalkCancelTree(t)
|
||||||
|
|
||||||
@@ -444,10 +438,6 @@ func TestRunScanInterruptedMidHash(t *testing.T) {
|
|||||||
t.Errorf("stderr = %q, want it to end with %q", got, want)
|
t.Errorf("stderr = %q, want it to end with %q", got, want)
|
||||||
}
|
}
|
||||||
|
|
||||||
if got := stdout(); got != "" {
|
|
||||||
t.Errorf("stdout = %q, want nothing (data only)", got)
|
|
||||||
}
|
|
||||||
|
|
||||||
assertNoSidecars(t, path)
|
assertNoSidecars(t, path)
|
||||||
|
|
||||||
db, err := openReportDatabase(t.Context(), path)
|
db, err := openReportDatabase(t.Context(), path)
|
||||||
|
|||||||
+33
-134
@@ -85,41 +85,21 @@ func makeReadOnly(t *testing.T, path string) {
|
|||||||
|
|
||||||
// captureStderr redirects os.Stderr to a file for the rest of the test
|
// captureStderr redirects os.Stderr to a file for the rest of the test
|
||||||
// and returns a function reading back everything written to it. scan
|
// and returns a function reading back everything written to it. scan
|
||||||
// writes its warnings and summary, and report and trees their
|
// writes its warnings and summary straight to os.Stderr, not to the
|
||||||
// summaries, straight to os.Stderr, not to the stderr writer run is
|
// stderr writer run is given.
|
||||||
// given.
|
|
||||||
func captureStderr(t *testing.T) func() string {
|
func captureStderr(t *testing.T) func() string {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
return capture(t, &os.Stderr)
|
f, err := os.Create(filepath.Join(t.TempDir(), "stderr"))
|
||||||
}
|
|
||||||
|
|
||||||
// captureStdout does for os.Stdout what captureStderr does for
|
|
||||||
// os.Stderr. scan is never given run's stdout writer, so anything it
|
|
||||||
// printed would go straight to os.Stdout. The scan tests pass os.Stdout
|
|
||||||
// as run's stdout too, so the one capture sees both.
|
|
||||||
func captureStdout(t *testing.T) func() string {
|
|
||||||
t.Helper()
|
|
||||||
|
|
||||||
return capture(t, &os.Stdout)
|
|
||||||
}
|
|
||||||
|
|
||||||
// capture redirects *std, which is os.Stdout or os.Stderr, to a file
|
|
||||||
// for the rest of the test and returns a function reading back
|
|
||||||
// everything written to it.
|
|
||||||
func capture(t *testing.T, std **os.File) func() string {
|
|
||||||
t.Helper()
|
|
||||||
|
|
||||||
f, err := os.Create(filepath.Join(t.TempDir(), "output"))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
saved := *std
|
saved := os.Stderr
|
||||||
*std = f
|
os.Stderr = f
|
||||||
|
|
||||||
t.Cleanup(func() {
|
t.Cleanup(func() {
|
||||||
*std = saved
|
os.Stderr = saved
|
||||||
|
|
||||||
_ = f.Close()
|
_ = f.Close()
|
||||||
})
|
})
|
||||||
@@ -204,33 +184,30 @@ func TestRunFatalAfterOpenClosesDatabase(t *testing.T) {
|
|||||||
// sidecar check is evidence of the close only for scan: report and
|
// sidecar check is evidence of the close only for scan: report and
|
||||||
// trees only read a database that is out of WAL mode, which leaves
|
// trees only read a database that is out of WAL mode, which leaves
|
||||||
// nothing on disk whether they close it or not.
|
// nothing on disk whether they close it or not.
|
||||||
//
|
cases := map[string][]string{
|
||||||
// The subcommands come from the command tree, so a new one is
|
cmdScan: {cmdScan},
|
||||||
// checked too: one wired with a bare RunE instead of runE reports
|
cmdReport: {cmdReport},
|
||||||
// its failure as a usage error, exit 2 with the usage text.
|
cmdTrees: {cmdTrees},
|
||||||
for _, cmd := range newRootCommand(io.Discard, io.Discard).Commands() {
|
}
|
||||||
name := cmd.Name()
|
|
||||||
|
|
||||||
|
for name, args := range cases {
|
||||||
t.Run(name, func(t *testing.T) {
|
t.Run(name, func(t *testing.T) {
|
||||||
path := brokenDatabase(t)
|
path := brokenDatabase(t)
|
||||||
t.Setenv(databaseEnv, path)
|
t.Setenv(databaseEnv, path)
|
||||||
|
|
||||||
args := []string{name}
|
|
||||||
if name == cmdScan {
|
if name == cmdScan {
|
||||||
args = append(args, t.TempDir())
|
args = append(args, t.TempDir())
|
||||||
}
|
}
|
||||||
|
|
||||||
stdout := captureStdout(t)
|
var stdout, stderr bytes.Buffer
|
||||||
|
|
||||||
var stderr bytes.Buffer
|
code := run(args, &stdout, &stderr)
|
||||||
|
|
||||||
code := run(args, os.Stdout, &stderr)
|
|
||||||
if code != exitFatal {
|
if code != exitFatal {
|
||||||
t.Errorf("run(%v) = %d, want %d", args, code, exitFatal)
|
t.Errorf("run(%v) = %d, want %d", args, code, exitFatal)
|
||||||
}
|
}
|
||||||
|
|
||||||
assertNoSidecars(t, path)
|
assertNoSidecars(t, path)
|
||||||
assertFatalOutput(t, stderr.String(), stdout())
|
assertFatalOutput(t, stderr.String(), stdout.String())
|
||||||
|
|
||||||
// Proof that the failure happened after the open: only a
|
// Proof that the failure happened after the open: only a
|
||||||
// query against the opened database can report this.
|
// query against the opened database can report this.
|
||||||
@@ -242,24 +219,22 @@ func TestRunFatalAfterOpenClosesDatabase(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRunNonexistentPathIsFatalNotUsage(t *testing.T) {
|
func TestRunMissingOperandIsFatalNotUsage(t *testing.T) {
|
||||||
// README §Error handling: a PATH operand that does not exist is a
|
// README §Error handling: a PATH operand that does not exist is a
|
||||||
// fatal error (1), not a usage error (2) — and a runtime failure
|
// fatal error (1), not a usage error (2) — and a runtime failure
|
||||||
// must not dump the usage text.
|
// must not dump the usage text.
|
||||||
t.Setenv(databaseEnv, testDBPath(t))
|
t.Setenv(databaseEnv, testDBPath(t))
|
||||||
|
|
||||||
stdout := captureStdout(t)
|
var stdout, stderr bytes.Buffer
|
||||||
|
|
||||||
var stderr bytes.Buffer
|
|
||||||
|
|
||||||
missing := filepath.Join(t.TempDir(), "nope")
|
missing := filepath.Join(t.TempDir(), "nope")
|
||||||
|
|
||||||
code := run([]string{cmdScan, missing}, os.Stdout, &stderr)
|
code := run([]string{cmdScan, missing}, &stdout, &stderr)
|
||||||
if code != exitFatal {
|
if code != exitFatal {
|
||||||
t.Errorf("run(scan %s) = %d, want %d", missing, code, exitFatal)
|
t.Errorf("run(scan %s) = %d, want %d", missing, code, exitFatal)
|
||||||
}
|
}
|
||||||
|
|
||||||
assertFatalOutput(t, stderr.String(), stdout())
|
assertFatalOutput(t, stderr.String(), stdout.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// assertFatalOutput checks that a fatal error was reported the way
|
// assertFatalOutput checks that a fatal error was reported the way
|
||||||
@@ -283,34 +258,6 @@ func assertFatalOutput(t *testing.T, stderr, stdout string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRunMissingDatabaseIsFatal(t *testing.T) {
|
|
||||||
// README §Database: report and trees need an existing database; a
|
|
||||||
// missing one exits 1 with a message telling the user to run scan.
|
|
||||||
for _, name := range []string{cmdReport, cmdTrees} {
|
|
||||||
t.Run(name, func(t *testing.T) {
|
|
||||||
path := testDBPath(t)
|
|
||||||
t.Setenv(databaseEnv, path)
|
|
||||||
|
|
||||||
var stdout, stderr bytes.Buffer
|
|
||||||
|
|
||||||
code := run([]string{name}, &stdout, &stderr)
|
|
||||||
if code != exitFatal {
|
|
||||||
t.Errorf("run(%s) = %d, want %d", name, code, exitFatal)
|
|
||||||
}
|
|
||||||
|
|
||||||
want := "sfdupes: " + path + ": no database (run \"sfdupes " +
|
|
||||||
"scan\" first, or set " + databaseEnv + ")\n"
|
|
||||||
if got := stderr.String(); got != want {
|
|
||||||
t.Errorf("stderr = %q, want %q", got, want)
|
|
||||||
}
|
|
||||||
|
|
||||||
if got := stdout.String(); got != "" {
|
|
||||||
t.Errorf("stdout = %q, want nothing (data only)", got)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRunUsageErrors(t *testing.T) {
|
func TestRunUsageErrors(t *testing.T) {
|
||||||
// Usage errors keep exiting 2 with cobra's own report on stderr.
|
// Usage errors keep exiting 2 with cobra's own report on stderr.
|
||||||
cases := map[string]struct {
|
cases := map[string]struct {
|
||||||
@@ -488,16 +435,17 @@ func scanFixture(t *testing.T) []string {
|
|||||||
func scanOK(t *testing.T, operands ...string) string {
|
func scanOK(t *testing.T, operands ...string) string {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
stdout := captureStdout(t)
|
var stdout bytes.Buffer
|
||||||
|
|
||||||
stderr := captureStderr(t)
|
stderr := captureStderr(t)
|
||||||
|
|
||||||
code := run(append([]string{cmdScan}, operands...), os.Stdout, os.Stderr)
|
code := run(append([]string{cmdScan}, operands...), &stdout, os.Stderr)
|
||||||
if code != exitOK {
|
if code != exitOK {
|
||||||
t.Fatalf("run(scan %q) = %d, want %d; stderr: %s",
|
t.Fatalf("run(scan %q) = %d, want %d; stderr: %s",
|
||||||
operands, code, exitOK, stderr())
|
operands, code, exitOK, stderr())
|
||||||
}
|
}
|
||||||
|
|
||||||
if got := stdout(); got != "" {
|
if got := stdout.String(); got != "" {
|
||||||
t.Errorf("scan stdout = %q, want nothing (data only)", got)
|
t.Errorf("scan stdout = %q, want nothing (data only)", got)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -505,41 +453,10 @@ func scanOK(t *testing.T, operands ...string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestRunScanSucceedsDespiteWarnings(t *testing.T) {
|
func TestRunScanSucceedsDespiteWarnings(t *testing.T) {
|
||||||
// README §Error handling: a scan that skips a file it cannot read
|
|
||||||
// warns, counts the skip in its summary, and still exits 0, which
|
|
||||||
// scanOK checks along with the empty stdout.
|
|
||||||
if os.Geteuid() == 0 {
|
|
||||||
t.Skip("root ignores file permissions")
|
|
||||||
}
|
|
||||||
|
|
||||||
path := testDBPath(t)
|
path := testDBPath(t)
|
||||||
t.Setenv(databaseEnv, path)
|
t.Setenv(databaseEnv, path)
|
||||||
|
|
||||||
dir := t.TempDir()
|
scanFixture(t)
|
||||||
writeFile(t, dir, "a.bin", pattern(1, 300))
|
|
||||||
|
|
||||||
// Same size as a.bin, so the scan reads it, and the read fails.
|
|
||||||
unreadable := writeFile(t, dir, "unreadable.bin", pattern(2, 300))
|
|
||||||
|
|
||||||
err := os.Chmod(unreadable, 0)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
stderr := scanOK(t, dir)
|
|
||||||
|
|
||||||
warning := "hash " + unreadable + ": open " + unreadable +
|
|
||||||
": permission denied\n"
|
|
||||||
if !strings.Contains(stderr, warning) {
|
|
||||||
t.Errorf("stderr = %q, want %q", stderr, warning)
|
|
||||||
}
|
|
||||||
|
|
||||||
summary := "scan: 1 files seen (1 added, 0 updated, 0 removed, " +
|
|
||||||
"0 unchanged), 1 skipped\n"
|
|
||||||
if !strings.Contains(stderr, summary) {
|
|
||||||
t.Errorf("stderr = %q, want %q", stderr, summary)
|
|
||||||
}
|
|
||||||
|
|
||||||
assertNoSidecars(t, path)
|
assertNoSidecars(t, path)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -646,14 +563,12 @@ func TestRunReportSucceeds(t *testing.T) {
|
|||||||
|
|
||||||
dupes := scanFixture(t)
|
dupes := scanFixture(t)
|
||||||
|
|
||||||
var stdout bytes.Buffer
|
var stdout, stderr bytes.Buffer
|
||||||
|
|
||||||
stderr := captureStderr(t)
|
code := run([]string{cmdReport}, &stdout, &stderr)
|
||||||
|
|
||||||
code := run([]string{cmdReport}, &stdout, os.Stderr)
|
|
||||||
if code != exitOK {
|
if code != exitOK {
|
||||||
t.Fatalf("run(report) = %d, want %d; stderr: %s",
|
t.Fatalf("run(report) = %d, want %d; stderr: %s",
|
||||||
code, exitOK, stderr())
|
code, exitOK, stderr.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
want := "first\tdupe\tsize\n" + dupes[0] + "\t" + dupes[1] + "\t300\n"
|
want := "first\tdupe\tsize\n" + dupes[0] + "\t" + dupes[1] + "\t300\n"
|
||||||
@@ -661,12 +576,6 @@ func TestRunReportSucceeds(t *testing.T) {
|
|||||||
t.Errorf("stdout = %q, want %q", got, want)
|
t.Errorf("stdout = %q, want %q", got, want)
|
||||||
}
|
}
|
||||||
|
|
||||||
want = "report: 2 records read, 1 duplicate groups, 1 dupe files, " +
|
|
||||||
"300 B reclaimable\n"
|
|
||||||
if got := stderr(); got != want {
|
|
||||||
t.Errorf("stderr = %q, want %q", got, want)
|
|
||||||
}
|
|
||||||
|
|
||||||
assertNoSidecars(t, path)
|
assertNoSidecars(t, path)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -676,14 +585,12 @@ func TestRunTreesSucceeds(t *testing.T) {
|
|||||||
|
|
||||||
dupes := scanFixture(t)
|
dupes := scanFixture(t)
|
||||||
|
|
||||||
var stdout bytes.Buffer
|
var stdout, stderr bytes.Buffer
|
||||||
|
|
||||||
stderr := captureStderr(t)
|
code := run([]string{cmdTrees}, &stdout, &stderr)
|
||||||
|
|
||||||
code := run([]string{cmdTrees}, &stdout, os.Stderr)
|
|
||||||
if code != exitOK {
|
if code != exitOK {
|
||||||
t.Fatalf("run(trees) = %d, want %d; stderr: %s",
|
t.Fatalf("run(trees) = %d, want %d; stderr: %s",
|
||||||
code, exitOK, stderr())
|
code, exitOK, stderr.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// The two directories holding the duplicate pair are duplicate
|
// The two directories holding the duplicate pair are duplicate
|
||||||
@@ -694,12 +601,6 @@ func TestRunTreesSucceeds(t *testing.T) {
|
|||||||
t.Errorf("stdout = %q, want %q", got, want)
|
t.Errorf("stdout = %q, want %q", got, want)
|
||||||
}
|
}
|
||||||
|
|
||||||
want = "trees: 2 records read, 1 duplicate tree groups, 1 dupe trees, " +
|
|
||||||
"300 B reclaimable\n"
|
|
||||||
if got := stderr(); got != want {
|
|
||||||
t.Errorf("stderr = %q, want %q", got, want)
|
|
||||||
}
|
|
||||||
|
|
||||||
assertNoSidecars(t, path)
|
assertNoSidecars(t, path)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -829,11 +730,9 @@ func TestRunSecondScanFails(t *testing.T) {
|
|||||||
|
|
||||||
holdScanLock(t, path)
|
holdScanLock(t, path)
|
||||||
|
|
||||||
stdout := captureStdout(t)
|
var stdout, stderr bytes.Buffer
|
||||||
|
|
||||||
var stderr bytes.Buffer
|
code := run([]string{cmdScan, t.TempDir()}, &stdout, &stderr)
|
||||||
|
|
||||||
code := run([]string{cmdScan, t.TempDir()}, os.Stdout, &stderr)
|
|
||||||
if code != exitFatal {
|
if code != exitFatal {
|
||||||
t.Errorf("run(scan) = %d, want %d", code, exitFatal)
|
t.Errorf("run(scan) = %d, want %d", code, exitFatal)
|
||||||
}
|
}
|
||||||
@@ -844,7 +743,7 @@ func TestRunSecondScanFails(t *testing.T) {
|
|||||||
t.Errorf("stderr = %q, want %q", got, want)
|
t.Errorf("stderr = %q, want %q", got, want)
|
||||||
}
|
}
|
||||||
|
|
||||||
if got := stdout(); got != "" {
|
if got := stdout.String(); got != "" {
|
||||||
t.Errorf("stdout = %q, want nothing (data only)", got)
|
t.Errorf("stdout = %q, want nothing (data only)", got)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,10 +14,6 @@
|
|||||||
# 0 in well under a second having run no linter. The PID is in the value
|
# 0 in well under a second having run no linter. The PID is in the value
|
||||||
# as well as the epoch because two lint runs land inside the same second
|
# as well as the epoch because two lint runs land inside the same second
|
||||||
# easily, and `date +%s` alone would cache the second one.
|
# easily, and `date +%s` alone would cache the second one.
|
||||||
#
|
|
||||||
# The result is the build's exit status and the image is never used, so
|
|
||||||
# --output=type=cacheonly writes none. Without it every run spends
|
|
||||||
# seconds exporting an image and leaves it behind untagged.
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||||
@@ -26,7 +22,6 @@ main() {
|
|||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
docker build \
|
docker build \
|
||||||
--build-arg CHECK_EPOCH="$(date +%s)-$$" \
|
--build-arg CHECK_EPOCH="$(date +%s)-$$" \
|
||||||
--output=type=cacheonly \
|
|
||||||
-f Dockerfile.lint \
|
-f Dockerfile.lint \
|
||||||
.
|
.
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user