Mirrors/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-03-09 00:00:02 +01:00
Code Issues Releases Wiki Activity

cmd_ls_integration_test --json lines: implemented recommendations from Michael Eischer

Browse source
This commit is contained in:
Winfried Plappert 2025-02-23 21:39:21 +00:00
parent b61b6ff539
commit 6d22ed22ee
2 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
changelog/unreleased/pull-5255
View file

@ -1,8 +0,0 @@
Change: add a test to cmd_ls_integration_test.go: test `rest ls --json`
Create backup of 0/for_cmd_ls, which contains only a few files.
Compare first line of ls --json oytput with snapshotID coming back from
`testRunList()`.
Compare node.Path with expected results list.
https://github.com/restic/restic/pull/5255

20
cmd/restic/cmd_ls_integration_test.go
View file

@ -120,18 +120,14 @@ func TestRunLsJson(t *testing.T) {
testSetupBackupData(t, env)
opts := BackupOptions{}
testRunBackup(t, env.testdata, []string{"0/for_cmd_ls"}, opts, env.gopts)
snapshotIDs := testRunList(t, "snapshots", env.gopts)
rtest.Assert(t, len(snapshotIDs) == 1, "expected one snapshot, got %v", snapshotIDs)
snapshotIDs := testListSnapshots(t, env.gopts, 1)
buf, err := withCaptureStdout(func() error {
env.gopts.Quiet = true
env.gopts.JSON = true
return runLs(context.TODO(), LsOptions{}, env.gopts, []string{"latest"})
})
rtest.OK(t, err)
byteLines := bytes.Split(buf.Bytes(), []byte{'\n'})
env.gopts.Quiet = true
env.gopts.JSON = true
buf := testRunLsWithOpts(t, env.gopts, LsOptions{}, []string{"latest"})
byteLines := bytes.Split(buf, []byte{'\n'})
// the snapshot structure from cmd_ls
// partial copy of snapshot structure from cmd_ls
type lsSnapshot struct {
*restic.Snapshot
ID *restic.ID `json:"id"`
@ -144,7 +140,7 @@ func TestRunLsJson(t *testing.T) {
rtest.OK(t, json.Unmarshal(byteLines[0], &snappy))
rtest.Equals(t, snappy.ShortID, snapshotIDs[0].Str(), "expected snap IDs to be identical")
// the node structure from cmd_ls
// partial copy of node structure from cmd_ls
type lsNode struct {
Name string `json:"name"`
Type string `json:"type"`
@ -162,6 +158,6 @@ func TestRunLsJson(t *testing.T) {
}
rtest.OK(t, json.Unmarshal(nodeLine, &testNode))
rtest.Assert(t, testNode.Path == pathList[i], "expected %s actual %s", pathList[i], testNode.Path)
rtest.Equals(t, pathList[i], testNode.Path)
}
}