diff options
author | Jakob Unterwurzacher | 2018-04-02 18:32:30 +0200 |
---|---|---|
committer | Jakob Unterwurzacher | 2018-04-02 18:32:30 +0200 |
commit | b6c8960b01f9e5366814b0dada57a0b1e6a031d9 (patch) | |
tree | 6a65255c30c7bcd086523fd4e0970d3b59b230de /tests/fsck | |
parent | e6caf56ea4ab10e747aa5dfc0a768cb8176ebe6a (diff) |
fsck: clean up log output
Make sure we get only 1 warning output per
problem.
Also, add new corruption types to broken_fs_v1.4.
Diffstat (limited to 'tests/fsck')
-rw-r--r-- | tests/fsck/broken_fs_v1.4/Ef-68icxbQ-TuvmnWHuItB1BeLB92dNCXMXiz2M-zPI | bin | 0 -> 18 bytes | |||
-rw-r--r-- | tests/fsck/broken_fs_v1.4/V5DjvW5BXlGl1yCIJn4lPgdjdMvW_LUfc7G-R8W1cZ0 | bin | 0 -> 8 bytes | |||
-rw-r--r-- | tests/fsck/broken_fs_v1.4/ejZ3FX0zlFTpSfv-FBJ2u3ojwSN1XSqpNpCHxa5VGWw | bin | 0 -> 1 bytes | |||
l--------- | tests/fsck/broken_fs_v1.4/iI0MtUdzELPeOAZYwYZFee169hpGgd3l2PXQBcc9sl4 | 1 | ||||
-rw-r--r-- | tests/fsck/broken_fs_v1.4/trqecbMNXdzLqzpk7fSfKw/gocryptfs.diriv | 1 | ||||
-rw-r--r-- | tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/gocryptfs.diriv | 1 | ||||
-rw-r--r-- | tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/uC2yqKyQUXSJF-YF1Ya5nQ | 0 | ||||
-rw-r--r-- | tests/fsck/fsck_test.go | 6 |
8 files changed, 3 insertions, 6 deletions
diff --git a/tests/fsck/broken_fs_v1.4/Ef-68icxbQ-TuvmnWHuItB1BeLB92dNCXMXiz2M-zPI b/tests/fsck/broken_fs_v1.4/Ef-68icxbQ-TuvmnWHuItB1BeLB92dNCXMXiz2M-zPI Binary files differnew file mode 100644 index 0000000..84b9a70 --- /dev/null +++ b/tests/fsck/broken_fs_v1.4/Ef-68icxbQ-TuvmnWHuItB1BeLB92dNCXMXiz2M-zPI diff --git a/tests/fsck/broken_fs_v1.4/V5DjvW5BXlGl1yCIJn4lPgdjdMvW_LUfc7G-R8W1cZ0 b/tests/fsck/broken_fs_v1.4/V5DjvW5BXlGl1yCIJn4lPgdjdMvW_LUfc7G-R8W1cZ0 Binary files differnew file mode 100644 index 0000000..6101efa --- /dev/null +++ b/tests/fsck/broken_fs_v1.4/V5DjvW5BXlGl1yCIJn4lPgdjdMvW_LUfc7G-R8W1cZ0 diff --git a/tests/fsck/broken_fs_v1.4/ejZ3FX0zlFTpSfv-FBJ2u3ojwSN1XSqpNpCHxa5VGWw b/tests/fsck/broken_fs_v1.4/ejZ3FX0zlFTpSfv-FBJ2u3ojwSN1XSqpNpCHxa5VGWw Binary files differnew file mode 100644 index 0000000..f76dd23 --- /dev/null +++ b/tests/fsck/broken_fs_v1.4/ejZ3FX0zlFTpSfv-FBJ2u3ojwSN1XSqpNpCHxa5VGWw diff --git a/tests/fsck/broken_fs_v1.4/iI0MtUdzELPeOAZYwYZFee169hpGgd3l2PXQBcc9sl4 b/tests/fsck/broken_fs_v1.4/iI0MtUdzELPeOAZYwYZFee169hpGgd3l2PXQBcc9sl4 new file mode 120000 index 0000000..4b707cb --- /dev/null +++ b/tests/fsck/broken_fs_v1.4/iI0MtUdzELPeOAZYwYZFee169hpGgd3l2PXQBcc9sl4 @@ -0,0 +1 @@ +%%%broken_symlink%%%
\ No newline at end of file diff --git a/tests/fsck/broken_fs_v1.4/trqecbMNXdzLqzpk7fSfKw/gocryptfs.diriv b/tests/fsck/broken_fs_v1.4/trqecbMNXdzLqzpk7fSfKw/gocryptfs.diriv new file mode 100644 index 0000000..41f0034 --- /dev/null +++ b/tests/fsck/broken_fs_v1.4/trqecbMNXdzLqzpk7fSfKw/gocryptfs.diriv @@ -0,0 +1 @@ +Wc diff --git a/tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/gocryptfs.diriv b/tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/gocryptfs.diriv new file mode 100644 index 0000000..29198ce --- /dev/null +++ b/tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/gocryptfs.diriv @@ -0,0 +1 @@ +LOã/;pl]Ù×n·ÌÙfooo diff --git a/tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/uC2yqKyQUXSJF-YF1Ya5nQ b/tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/uC2yqKyQUXSJF-YF1Ya5nQ new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/fsck/broken_fs_v1.4/yrwcjj2qoC4IYvhw9sbfRg/uC2yqKyQUXSJF-YF1Ya5nQ diff --git a/tests/fsck/fsck_test.go b/tests/fsck/fsck_test.go index 7506636..b5bbf84 100644 --- a/tests/fsck/fsck_test.go +++ b/tests/fsck/fsck_test.go @@ -2,7 +2,6 @@ package fsck import ( "os/exec" - "strings" "testing" "github.com/rfjakob/gocryptfs/internal/exitcodes" @@ -18,9 +17,4 @@ func TestBrokenFsV14(t *testing.T) { if code != exitcodes.FsckErrors { t.Errorf("wrong exit code, have=%d want=%d", code, exitcodes.FsckErrors) } - lines := strings.Split(out, "\n") - summaryLine := lines[len(lines)-2] - if summaryLine != "fsck: found 5 problems" { - t.Errorf("wrong summary line: %q", summaryLine) - } } |