mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
* refine the plan
* Fix all staticcheck lint findings (uncapped)
golangci-lint's default max-same-issues=3 was hiding most of the backlog:
the true pre-fix count was 69 staticcheck findings, not 34. This fixes all
of them, driving staticcheck to zero:
- ST1023/QF1011 (37): omit explicit types inferred from the RHS
- S1009/S1031 (15): drop redundant nil checks before len()/range
- SA9003 (9): remove comment-only empty branches, keeping the comments
- QF1007 (3): merge conditional assignment into declaration
- QF1006 (3): lift break conditions into loop conditions
- QF1001 (3): apply De Morgan's law / name the negated predicate
Also updates plans/lintfixes.md with the cap discovery and the corrected
errcheck picture (1202 uncapped, ~949 of them fmt.Fprint*).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* Drive errcheck to zero: config for bulk categories, propagate real errors
Adds .golangci.yml with errcheck exclude-functions for fmt.Fprint* (usage
printers), (*bufio.Writer).Write/WriteString (sticky errors, surfaced at the
now-checked final Flush), and (*strings.Builder).WriteString; pins
max-issues-per-linter/max-same-issues to 0 so CI reports true counts.
Real error paths now propagate instead of being dropped:
- Finalize{Reader,Writer}Options in join/put/filter/split/tee and the
repl/script entry points: 'mlr join -i badformat' now errors instead of
silently using wrong separators
- final output-stream Flush in pkg/stream: write failure no longer exits 0
- DSL emit/print/dump redirect writes, matching their sibling branches
- CSV writer WriteCSVRecordMaybeColorized, close-time Flush in file output
handlers, ENV[...] Setenv, REPL record-write and redirect-close errors
- termcvt write-side Close before rename (had "TODO: check return status")
The rest are deliberate ignores, marked with _ = and a comment where the
reason isn't obvious: unset-of-missing-path no-ops, read-side closes,
mid-stream FlushOnEveryRecord, init-time strftime registrations, in-memory
usage-capture pipes, and regtest-harness env/temp-file teardown.
golangci-lint now reports 0 issues on ./cmd/mlr ./pkg/... with all caps off.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
127 lines
3.6 KiB
Go
127 lines
3.6 KiB
Go
package regtest
|
|
|
|
import (
|
|
"bytes"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/lib"
|
|
"github.com/johnkerl/miller/v6/pkg/platform"
|
|
)
|
|
|
|
// RunMillerCommand runs a string like 'mlr cat foo.dat', with specified mlr
|
|
// executable name to be interpolated into the args[0] slot. This allows us to
|
|
// compare different versions of Miller using the same test data.
|
|
//
|
|
// Note the argsString could have left the exe name off entirely, like 'tac
|
|
// foo.dat', but it's desirable for debugging to have the command-files be
|
|
// directly runnable as-is.
|
|
func RunMillerCommand(
|
|
millerExe string,
|
|
argsString string,
|
|
) (
|
|
stdout string,
|
|
stderr string,
|
|
exitCode int,
|
|
) {
|
|
argsString = strings.TrimRight(argsString, "\n")
|
|
argsString = strings.TrimRight(argsString, "\r")
|
|
|
|
// Insert the desired Miller executable.
|
|
if strings.HasPrefix(argsString, "mlr ") {
|
|
argsString = strings.Replace(argsString, "mlr", millerExe, 1)
|
|
}
|
|
|
|
// This is bash -c ... or cmd /c ...
|
|
shellRunArray := platform.GetShellRunArray(argsString)
|
|
|
|
cmd := exec.Command(shellRunArray[0], shellRunArray[1:]...)
|
|
|
|
var stdoutBuffer bytes.Buffer
|
|
var stderrBuffer bytes.Buffer
|
|
|
|
cmd.Stdout = &stdoutBuffer
|
|
cmd.Stderr = &stderrBuffer
|
|
|
|
err := cmd.Run()
|
|
|
|
exitCode = 0
|
|
stdout = stdoutBuffer.String()
|
|
stderr = stderrBuffer.String()
|
|
|
|
if err != nil {
|
|
exitCode = 1
|
|
exitError, ok := err.(*exec.ExitError)
|
|
if ok {
|
|
exitCode = exitError.ExitCode()
|
|
}
|
|
}
|
|
|
|
return stdout, stderr, exitCode
|
|
}
|
|
|
|
// RunDiffCommandOnStrings runs either diff or fc (not-Windows / Windows
|
|
// respectively) to show differences between actual and expected
|
|
// regression-test output.
|
|
func RunDiffCommandOnStrings(
|
|
actualOutput string,
|
|
expectedOutput string,
|
|
) (
|
|
diffOutput string,
|
|
) {
|
|
actualOutputFileName := lib.WriteTempFileOrDie(actualOutput)
|
|
expectedOutputFileName := lib.WriteTempFileOrDie(expectedOutput)
|
|
defer func() { _ = os.Remove(actualOutputFileName) }()
|
|
defer func() { _ = os.Remove(expectedOutputFileName) }()
|
|
|
|
// This is diff or fc
|
|
diffRunArray := platform.GetDiffRunArray(actualOutputFileName, expectedOutputFileName)
|
|
|
|
cmd := exec.Command(diffRunArray[0], diffRunArray[1:]...)
|
|
|
|
var stdoutBuffer bytes.Buffer
|
|
var stderrBuffer bytes.Buffer
|
|
cmd.Stdout = &stdoutBuffer
|
|
cmd.Stderr = &stderrBuffer
|
|
|
|
// Ignore the error-return since it's likely the fact that diff exits
|
|
// non-zero when files differ at all. Otherwise it's a failure to invoke
|
|
// diff itself, about which we can do little within the regtest. A diff
|
|
// output is simply something (in addition to printing the actual &
|
|
// expected outputs) to help people debug, and hey, we tried.
|
|
|
|
_ = cmd.Run()
|
|
|
|
return stdoutBuffer.String()
|
|
}
|
|
|
|
// RunDiffCommandOnFilenames runs either diff or fc (not-Windows / Windows
|
|
// respectively) to show differences between actual and expected
|
|
// regression-test output.
|
|
func RunDiffCommandOnFilenames(
|
|
actualOutputFileName string,
|
|
expectedOutputFileName string,
|
|
) (
|
|
diffOutput string,
|
|
) {
|
|
// This is diff or fc
|
|
diffRunArray := platform.GetDiffRunArray(actualOutputFileName, expectedOutputFileName)
|
|
|
|
cmd := exec.Command(diffRunArray[0], diffRunArray[1:]...)
|
|
|
|
var stdoutBuffer bytes.Buffer
|
|
var stderrBuffer bytes.Buffer
|
|
cmd.Stdout = &stdoutBuffer
|
|
cmd.Stderr = &stderrBuffer
|
|
|
|
// Ignore the error-return since it's likely the fact that diff exits
|
|
// non-zero when files differ at all. Otherwise it's a failure to invoke
|
|
// diff itself, about which we can do little within the regtest. A diff
|
|
// output is simply something (in addition to printing the actual &
|
|
// expected outputs) to help people debug, and hey, we tried.
|
|
|
|
_ = cmd.Run()
|
|
|
|
return stdoutBuffer.String()
|
|
}
|