From 69d88505fd7f4cb0d9e4f1918de296342fe05858 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Mon, 23 Aug 2021 15:05:15 +0200 Subject: go mod: declare module version v2 Our git version is v2+ for some time now, but go.mod still declared v1. Hopefully making both match makes https://pkg.go.dev/github.com/rfjakob/gocryptfs/v2 work. All the import paths have been fixed like this: find . -name \*.go | xargs sed -i s%github.com/rfjakob/gocryptfs/%github.com/rfjakob/gocryptfs/v2/% --- tests/cli/cli_test.go | 24 +++++++++++----------- tests/cli/zerokey.go | 2 +- tests/defaults/acl_test.go | 6 +++--- tests/defaults/ctlsock_test.go | 4 ++-- tests/defaults/diriv_test.go | 2 +- tests/defaults/main_test.go | 4 ++-- tests/defaults/performance_test.go | 2 +- .../deterministic_names_test.go | 4 ++-- .../example_filesystems_test.go | 4 ++-- tests/example_filesystems/example_test_helpers.go | 2 +- tests/fsck/fsck_test.go | 4 ++-- tests/hkdf_sanity/sanity_test.go | 2 +- tests/matrix/concurrency_test.go | 6 +++--- tests/matrix/dir_test.go | 4 ++-- tests/matrix/fallocate_test.go | 6 +++--- tests/matrix/matrix_test.go | 10 ++++----- tests/plaintextnames/file_holes_test.go | 4 ++-- tests/plaintextnames/plaintextnames_test.go | 4 ++-- tests/reverse/correctness_test.go | 8 ++++---- tests/reverse/ctlsock_test.go | 4 ++-- tests/reverse/exclude_test.go | 8 ++++---- tests/reverse/main_test.go | 2 +- tests/reverse/one_file_system_test.go | 2 +- tests/root_test/root_test.go | 4 ++-- tests/sharedstorage/sharedstorage_test.go | 2 +- tests/test_helpers/helpers.go | 6 +++--- tests/xattr/xattr_fd_test.go | 2 +- tests/xattr/xattr_integration_test.go | 4 ++-- 28 files changed, 68 insertions(+), 68 deletions(-) (limited to 'tests') diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go index 85a8006..4055c97 100644 --- a/tests/cli/cli_test.go +++ b/tests/cli/cli_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "github.com/rfjakob/gocryptfs/internal/configfile" - "github.com/rfjakob/gocryptfs/internal/exitcodes" - "github.com/rfjakob/gocryptfs/internal/nametransform" + "github.com/rfjakob/gocryptfs/v2/internal/configfile" + "github.com/rfjakob/gocryptfs/v2/internal/exitcodes" + "github.com/rfjakob/gocryptfs/v2/internal/nametransform" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) var testPw = []byte("test") @@ -61,9 +61,9 @@ func TestInitFilePerms(t *testing.T) { syscall.Stat(dir+"/gocryptfs.diriv", &st) perms = st.Mode & 0777 // From v1.7.1, these are created with 0440 permissions, see - // https://github.com/rfjakob/gocryptfs/issues/387 . + // https://github.com/rfjakob/gocryptfs/v2/issues/387 . // From v2.0, created with 0444 perms, see - // https://github.com/rfjakob/gocryptfs/issues/539 . + // https://github.com/rfjakob/gocryptfs/v2/issues/539 . if perms != 0444 { t.Errorf("Wrong permissions for gocryptfs.diriv: %#o", perms) } @@ -442,7 +442,7 @@ func TestPasswdPasswordIncorrect(t *testing.T) { // Check that we correctly background on mount and close stderr and stdout. // Something like // gocryptfs a b | cat -// must not hang ( https://github.com/rfjakob/gocryptfs/issues/130 ). +// must not hang ( https://github.com/rfjakob/gocryptfs/v2/issues/130 ). func TestMountBackground(t *testing.T) { dir := test_helpers.InitFS(t) mnt := dir + ".mnt" @@ -558,7 +558,7 @@ func TestExcludeForward(t *testing.T) { } // Check that the config file can be read from a named pipe. -// Make sure bug https://github.com/rfjakob/gocryptfs/issues/258 does not come +// Make sure bug https://github.com/rfjakob/gocryptfs/v2/issues/258 does not come // back. func TestConfigPipe(t *testing.T) { dir := test_helpers.InitFS(t) @@ -581,7 +581,7 @@ func TestConfigPipe(t *testing.T) { } // Ciphertext dir and mountpoint contains a comma -// https://github.com/rfjakob/gocryptfs/issues/262 +// https://github.com/rfjakob/gocryptfs/v2/issues/262 func TestComma(t *testing.T) { dir0 := test_helpers.InitFS(t) dir := dir0 + ",foo,bar" @@ -626,7 +626,7 @@ func TestIdle(t *testing.T) { } // Mount with idle timeout of 100ms read something every 10ms. The fs should -// NOT get unmounted. Regression test for https://github.com/rfjakob/gocryptfs/issues/421 +// NOT get unmounted. Regression test for https://github.com/rfjakob/gocryptfs/v2/issues/421 func TestNotIdle(t *testing.T) { dir := test_helpers.InitFS(t) mnt := dir + ".mnt" @@ -664,7 +664,7 @@ func TestNotIdle(t *testing.T) { // TestSymlinkedCipherdir checks that if CIPHERDIR itself is a symlink, it is // followed. -// https://github.com/rfjakob/gocryptfs/issues/450 +// https://github.com/rfjakob/gocryptfs/v2/issues/450 func TestSymlinkedCipherdir(t *testing.T) { dir := test_helpers.InitFS(t) dirSymlink := dir + ".symlink" @@ -910,7 +910,7 @@ func TestPassfileX2(t *testing.T) { } // TestInitNotEmpty checks that `gocryptfs -init` returns the right error code -// if CIPHERDIR is not empty. See https://github.com/rfjakob/gocryptfs/pull/503 +// if CIPHERDIR is not empty. See https://github.com/rfjakob/gocryptfs/v2/pull/503 func TestInitNotEmpty(t *testing.T) { dir := test_helpers.TmpDir + "/" + t.Name() if err := os.Mkdir(dir, 0700); err != nil { diff --git a/tests/cli/zerokey.go b/tests/cli/zerokey.go index b809d1f..e9b9c50 100644 --- a/tests/cli/zerokey.go +++ b/tests/cli/zerokey.go @@ -6,7 +6,7 @@ import ( "os/exec" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) // TestZerokey verifies that `gocryptfs -zerokey` uses the same options as diff --git a/tests/defaults/acl_test.go b/tests/defaults/acl_test.go index f3c707e..94d3c38 100644 --- a/tests/defaults/acl_test.go +++ b/tests/defaults/acl_test.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/xattr" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) -// https://github.com/rfjakob/gocryptfs/issues/543 +// https://github.com/rfjakob/gocryptfs/v2/issues/543 func TestCpA(t *testing.T) { fn1 := filepath.Join(test_helpers.TmpDir, t.Name()) fn2 := filepath.Join(test_helpers.DefaultPlainDir, t.Name()) @@ -77,7 +77,7 @@ func getfacl(fn string) (string, error) { return string(out), err } -// https://github.com/rfjakob/gocryptfs/issues/543 +// https://github.com/rfjakob/gocryptfs/v2/issues/543 func TestAcl543(t *testing.T) { fn1 := test_helpers.TmpDir + "/TestAcl543" fn2 := test_helpers.DefaultPlainDir + "/TestAcl543" diff --git a/tests/defaults/ctlsock_test.go b/tests/defaults/ctlsock_test.go index ac64f42..78841b9 100644 --- a/tests/defaults/ctlsock_test.go +++ b/tests/defaults/ctlsock_test.go @@ -5,8 +5,8 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/ctlsock" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/ctlsock" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestCtlSock(t *testing.T) { diff --git a/tests/defaults/diriv_test.go b/tests/defaults/diriv_test.go index bf8f233..639b33d 100644 --- a/tests/defaults/diriv_test.go +++ b/tests/defaults/diriv_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestDirIVRace(t *testing.T) { diff --git a/tests/defaults/main_test.go b/tests/defaults/main_test.go index ddaca68..0acab2d 100644 --- a/tests/defaults/main_test.go +++ b/tests/defaults/main_test.go @@ -14,7 +14,7 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestMain(m *testing.M) { @@ -239,7 +239,7 @@ func TestMvWarningSymlink(t *testing.T) { if err != nil { t.Log(string(out)) if runtime.GOOS == "darwin" { - t.Skip("mv on darwin chokes on broken symlinks, see https://github.com/rfjakob/gocryptfs/issues/349") + t.Skip("mv on darwin chokes on broken symlinks, see https://github.com/rfjakob/gocryptfs/v2/issues/349") } t.Fatal(err) } diff --git a/tests/defaults/performance_test.go b/tests/defaults/performance_test.go index a2ecf8c..11d827f 100644 --- a/tests/defaults/performance_test.go +++ b/tests/defaults/performance_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) // Benchmarks diff --git a/tests/deterministic_names/deterministic_names_test.go b/tests/deterministic_names/deterministic_names_test.go index e94b0b6..00d80fc 100644 --- a/tests/deterministic_names/deterministic_names_test.go +++ b/tests/deterministic_names/deterministic_names_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/rfjakob/gocryptfs/internal/configfile" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/internal/configfile" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) var cDir string diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go index 36fb554..b07b5f3 100644 --- a/tests/example_filesystems/example_filesystems_test.go +++ b/tests/example_filesystems/example_filesystems_test.go @@ -14,8 +14,8 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/internal/stupidgcm" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) var opensslOpt string diff --git a/tests/example_filesystems/example_test_helpers.go b/tests/example_filesystems/example_test_helpers.go index e39f8d6..c56d75a 100644 --- a/tests/example_filesystems/example_test_helpers.go +++ b/tests/example_filesystems/example_test_helpers.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) const statusTxtContent = "It works!\n" diff --git a/tests/fsck/fsck_test.go b/tests/fsck/fsck_test.go index 3aaba9e..cebc86b 100644 --- a/tests/fsck/fsck_test.go +++ b/tests/fsck/fsck_test.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/xattr" - "github.com/rfjakob/gocryptfs/internal/exitcodes" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/internal/exitcodes" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func dec64(in string) (out []byte) { diff --git a/tests/hkdf_sanity/sanity_test.go b/tests/hkdf_sanity/sanity_test.go index b382861..f221439 100644 --- a/tests/hkdf_sanity/sanity_test.go +++ b/tests/hkdf_sanity/sanity_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestBrokenContent(t *testing.T) { diff --git a/tests/matrix/concurrency_test.go b/tests/matrix/concurrency_test.go index 1afd33d..fa713df 100644 --- a/tests/matrix/concurrency_test.go +++ b/tests/matrix/concurrency_test.go @@ -9,10 +9,10 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) -// https://github.com/rfjakob/gocryptfs/issues/363 +// https://github.com/rfjakob/gocryptfs/v2/issues/363 // // Note: this test calls log.Fatal() instead of t.Fatal() because apparently, // calling t.Fatal() from a goroutine hangs the test. @@ -73,7 +73,7 @@ func TestConcurrentReadWrite(t *testing.T) { wg.Wait() } -// https://github.com/rfjakob/gocryptfs/issues/363 +// https://github.com/rfjakob/gocryptfs/v2/issues/363 // // Note: this test calls log.Fatal() instead of t.Fatal() because apparently, // calling t.Fatal() from a goroutine hangs the test. diff --git a/tests/matrix/dir_test.go b/tests/matrix/dir_test.go index 2f7a034..52c97a7 100644 --- a/tests/matrix/dir_test.go +++ b/tests/matrix/dir_test.go @@ -7,7 +7,7 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) // Test Mkdir and Rmdir @@ -34,7 +34,7 @@ func TestDirOverwrite(t *testing.T) { } // Test that we can create and remove a directory regardless of the permission it has -// https://github.com/rfjakob/gocryptfs/issues/354 +// https://github.com/rfjakob/gocryptfs/v2/issues/354 func TestRmdirPerms(t *testing.T) { for _, perm := range []uint32{0000, 0100, 0200, 0300, 0400, 0500, 0600, 0700} { dir := fmt.Sprintf("TestRmdir%#o", perm) diff --git a/tests/matrix/fallocate_test.go b/tests/matrix/fallocate_test.go index dde0685..c94c070 100644 --- a/tests/matrix/fallocate_test.go +++ b/tests/matrix/fallocate_test.go @@ -6,8 +6,8 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/internal/syscallcompat" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) const ( @@ -149,7 +149,7 @@ func TestFallocate(t *testing.T) { } } // We used to allocate 18 bytes too much: - // https://github.com/rfjakob/gocryptfs/issues/311 + // https://github.com/rfjakob/gocryptfs/v2/issues/311 // // 8110 bytes of plaintext should get us exactly 8192 bytes of ciphertext. err = file.Truncate(0) diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go index c51b391..0ee5688 100644 --- a/tests/matrix/matrix_test.go +++ b/tests/matrix/matrix_test.go @@ -23,8 +23,8 @@ import ( "golang.org/x/sys/unix" - "github.com/rfjakob/gocryptfs/internal/stupidgcm" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) // Several tests need to be aware if plaintextnames is active or not, so make this @@ -763,7 +763,7 @@ func TestMkfifo(t *testing.T) { } // TestMagicNames verifies that "magic" names are handled correctly -// https://github.com/rfjakob/gocryptfs/issues/174 +// https://github.com/rfjakob/gocryptfs/v2/issues/174 func TestMagicNames(t *testing.T) { names := []string{"warmup1", "warmup2", "gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs", "gocryptfs.diriv"} for _, n := range names { @@ -880,7 +880,7 @@ func TestStatfs(t *testing.T) { } // gocryptfs 2.0 reported the ciphertext size on symlink creation, causing -// confusion: https://github.com/rfjakob/gocryptfs/issues/574 +// confusion: https://github.com/rfjakob/gocryptfs/v2/issues/574 func TestSymlinkSize(t *testing.T) { p := filepath.Join(test_helpers.DefaultPlainDir, t.Name()) // SYMLINK reports the size to the kernel @@ -900,7 +900,7 @@ func TestSymlinkSize(t *testing.T) { // TestPwd check that /usr/bin/pwd works inside gocryptfs. // // This was broken in gocryptfs v2.0 with -sharedstorage: -// https://github.com/rfjakob/gocryptfs/issues/584 +// https://github.com/rfjakob/gocryptfs/v2/issues/584 func TestPwd(t *testing.T) { dir := test_helpers.DefaultPlainDir for i := 0; i < 3; i++ { diff --git a/tests/plaintextnames/file_holes_test.go b/tests/plaintextnames/file_holes_test.go index 5de0152..a17597a 100644 --- a/tests/plaintextnames/file_holes_test.go +++ b/tests/plaintextnames/file_holes_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" - "github.com/rfjakob/gocryptfs/contrib/findholes/holes" + "github.com/rfjakob/gocryptfs/v2/contrib/findholes/holes" ) func findHolesPretty(t *testing.T, path string) string { diff --git a/tests/plaintextnames/plaintextnames_test.go b/tests/plaintextnames/plaintextnames_test.go index e3cf953..c6d6145 100644 --- a/tests/plaintextnames/plaintextnames_test.go +++ b/tests/plaintextnames/plaintextnames_test.go @@ -9,9 +9,9 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/internal/configfile" + "github.com/rfjakob/gocryptfs/v2/internal/configfile" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) var cDir string diff --git a/tests/reverse/correctness_test.go b/tests/reverse/correctness_test.go index 87d2f12..3b25112 100644 --- a/tests/reverse/correctness_test.go +++ b/tests/reverse/correctness_test.go @@ -11,9 +11,9 @@ import ( "golang.org/x/sys/unix" - "github.com/rfjakob/gocryptfs/ctlsock" - "github.com/rfjakob/gocryptfs/internal/syscallcompat" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/ctlsock" + "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) // TestLongnameStat checks that file names of all sizes (1 to 255) show up in @@ -185,7 +185,7 @@ func TestEnoent(t *testing.T) { // If the symlink target gets too long due to base64 encoding, we should // return ENAMETOOLONG instead of having the kernel reject the data and // returning an I/O error to the user. -// https://github.com/rfjakob/gocryptfs/issues/167 +// https://github.com/rfjakob/gocryptfs/v2/issues/167 func TestTooLongSymlink(t *testing.T) { var err error var l int diff --git a/tests/reverse/ctlsock_test.go b/tests/reverse/ctlsock_test.go index ecb0b96..f59fa45 100644 --- a/tests/reverse/ctlsock_test.go +++ b/tests/reverse/ctlsock_test.go @@ -5,8 +5,8 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/ctlsock" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/ctlsock" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) var ctlSockTestCases = [][]string{ diff --git a/tests/reverse/exclude_test.go b/tests/reverse/exclude_test.go index b0e7135..e37050c 100644 --- a/tests/reverse/exclude_test.go +++ b/tests/reverse/exclude_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/rfjakob/gocryptfs/ctlsock" - "github.com/rfjakob/gocryptfs/internal/nametransform" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/ctlsock" + "github.com/rfjakob/gocryptfs/v2/internal/nametransform" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func ctlsockEncryptPath(t *testing.T, sock string, path string) string { @@ -128,7 +128,7 @@ func TestExcludeTestFs(t *testing.T) { } // Exclude everything using "/*", then selectively include only dir1 using "!/dir1" -// https://github.com/rfjakob/gocryptfs/issues/588 +// https://github.com/rfjakob/gocryptfs/v2/issues/588 func TestExcludeAllOnlyDir1(t *testing.T) { // --exclude-wildcard patterns, gitignore syntax patterns := []string{ diff --git a/tests/reverse/main_test.go b/tests/reverse/main_test.go index 3b9e7d0..2fc9e5e 100644 --- a/tests/reverse/main_test.go +++ b/tests/reverse/main_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) var x240 = string(bytes.Repeat([]byte("x"), 240)) diff --git a/tests/reverse/one_file_system_test.go b/tests/reverse/one_file_system_test.go index a3e441f..61190ea 100644 --- a/tests/reverse/one_file_system_test.go +++ b/tests/reverse/one_file_system_test.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestOneFileSystem(t *testing.T) { diff --git a/tests/root_test/root_test.go b/tests/root_test/root_test.go index d9d5dfc..3794e69 100644 --- a/tests/root_test/root_test.go +++ b/tests/root_test/root_test.go @@ -12,11 +12,11 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/internal/syscallcompat" + "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat" "golang.org/x/sys/unix" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func asUser(uid int, gid int, supplementaryGroups []int, f func() error) error { diff --git a/tests/sharedstorage/sharedstorage_test.go b/tests/sharedstorage/sharedstorage_test.go index 8f46c0d..a08deed 100644 --- a/tests/sharedstorage/sharedstorage_test.go +++ b/tests/sharedstorage/sharedstorage_test.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/unix" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) var flagSharestorage bool diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go index 87dba0a..daa37d7 100644 --- a/tests/test_helpers/helpers.go +++ b/tests/test_helpers/helpers.go @@ -13,9 +13,9 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/ctlsock" - "github.com/rfjakob/gocryptfs/internal/nametransform" - "github.com/rfjakob/gocryptfs/internal/syscallcompat" + "github.com/rfjakob/gocryptfs/v2/ctlsock" + "github.com/rfjakob/gocryptfs/v2/internal/nametransform" + "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat" ) // TmpDir will be created inside this directory, set in init() to diff --git a/tests/xattr/xattr_fd_test.go b/tests/xattr/xattr_fd_test.go index 7415e54..76fc3ab 100644 --- a/tests/xattr/xattr_fd_test.go +++ b/tests/xattr/xattr_fd_test.go @@ -11,7 +11,7 @@ import ( "golang.org/x/sys/unix" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestFdXattr(t *testing.T) { diff --git a/tests/xattr/xattr_integration_test.go b/tests/xattr/xattr_integration_test.go index be48fc0..efe903b 100644 --- a/tests/xattr/xattr_integration_test.go +++ b/tests/xattr/xattr_integration_test.go @@ -18,8 +18,8 @@ import ( "github.com/pkg/xattr" - "github.com/rfjakob/gocryptfs/internal/cryptocore" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/internal/cryptocore" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestMain(m *testing.M) { -- cgit v1.2.3