diff options
author | Jakob Unterwurzacher | 2016-06-23 21:29:00 +0200 |
---|---|---|
committer | Jakob Unterwurzacher | 2016-06-23 21:38:59 +0200 |
commit | b17f0465c7c38cab2f1f4ad0fc25d64d5cd175e7 (patch) | |
tree | c898e5a535f0f9c0f8fcd8c58a01ac78ac550298 /tests/example_filesystems | |
parent | 8a2e1a543aa793bf234838b8ba03b28c43f802a8 (diff) |
Drop deprecated "-diriv" option
The DirIV feature flag is already mandatory, dropping the command
line option is the final step.
Diffstat (limited to 'tests/example_filesystems')
-rw-r--r-- | tests/example_filesystems/example_filesystems_test.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go index c4a0cad..d91a040 100644 --- a/tests/example_filesystems/example_filesystems_test.go +++ b/tests/example_filesystems/example_filesystems_test.go @@ -86,14 +86,15 @@ func TestExampleFSv04(t *testing.T) { if err != nil { t.Fatal(err) } - err = test_helpers.Mount(cDir, pDir, "-extpass", "echo test") + err = test_helpers.Mount(cDir, pDir, false, "-extpass", "echo test") if err == nil { t.Errorf("Mounting deprecated FS should fail") } - test_helpers.MountOrFatal(t, cDir, pDir, "-masterkey", "74676e34-0b47c145-00dac61a-17a92316-"+ + err = test_helpers.Mount(cDir, pDir, false, "-masterkey", "74676e34-0b47c145-00dac61a-17a92316-"+ "bb57044c-e205b71f-65f4fdca-7cabd4b3", "-diriv=false", "-emenames=false", "-gcmiv128=false") - checkExampleFS(t, pDir, true) - test_helpers.Unmount(pDir) + if err == nil { + t.Errorf("Mounting deprecated FS should fail") + } err = os.Remove(pDir) if err != nil { t.Error(err) @@ -109,7 +110,7 @@ func TestExampleFSv05(t *testing.T) { if err != nil { t.Fatal(err) } - err = test_helpers.Mount(cDir, pDir, "-extpass", "echo test") + err = test_helpers.Mount(cDir, pDir, false, "-extpass", "echo test") if err == nil { t.Errorf("Mounting deprecated FS should fail") } @@ -132,7 +133,7 @@ func TestExampleFSv06(t *testing.T) { if err != nil { t.Fatal(err) } - err = test_helpers.Mount(cDir, pDir, "-extpass", "echo test") + err = test_helpers.Mount(cDir, pDir, false, "-extpass", "echo test") if err == nil { t.Errorf("Mounting deprecated FS should fail") } @@ -157,7 +158,7 @@ func TestExampleFSv06PlaintextNames(t *testing.T) { if err != nil { t.Fatal(err) } - err = test_helpers.Mount(cDir, pDir, "-extpass", "echo test") + err = test_helpers.Mount(cDir, pDir, false, "-extpass", "echo test") if err == nil { t.Errorf("Mounting deprecated FS should fail") } |