From fbd48a3771756e57a717a8015446ecb87ac9d536 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 16 Sep 2019 18:43:37 +0200 Subject: [PATCH] fix/skip tests for Go 1.13 See https://golang.org/doc/go1.13#os for the corresponding change. --- samples/memfs/memfs_test.go | 9 ++------- samples/memfs/posix_test.go | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/samples/memfs/memfs_test.go b/samples/memfs/memfs_test.go index 6e78a1b..9abe923 100644 --- a/samples/memfs/memfs_test.go +++ b/samples/memfs/memfs_test.go @@ -775,7 +775,7 @@ func (t *MemFSTest) WriteAtDoesntChangeOffset_AppendMode() { // Create a file in append mode. f, err := os.OpenFile( path.Join(t.Dir, "foo"), - os.O_RDWR|os.O_APPEND|os.O_CREATE, + os.O_RDWR|os.O_CREATE, 0600) t.ToClose = append(t.ToClose, f) @@ -851,11 +851,6 @@ func (t *MemFSTest) AppendMode() { AssertEq(nil, err) ExpectEq(13, off) - // A random write should still work, without updating the offset. - n, err = f.WriteAt([]byte("H"), 0) - AssertEq(nil, err) - AssertEq(1, n) - off, err = getFileOffset(f) AssertEq(nil, err) ExpectEq(13, off) @@ -873,7 +868,7 @@ func (t *MemFSTest) AppendMode() { // So we allow either the POSIX result or the Linux result. n, err = f.ReadAt(buf, 0) AssertEq(io.EOF, err) - ExpectThat(string(buf[:n]), AnyOf("Hello, world!", "Jello, world!H")) + ExpectThat(string(buf[:n]), AnyOf("Jello, world!", "Jello, world!H")) } func (t *MemFSTest) ReadsPastEndOfFile() { diff --git a/samples/memfs/posix_test.go b/samples/memfs/posix_test.go index 5b9680c..44d2892 100644 --- a/samples/memfs/posix_test.go +++ b/samples/memfs/posix_test.go @@ -167,6 +167,7 @@ func (t *PosixTest) WriteStartsPastEndOfFile() { } func (t *PosixTest) WriteStartsPastEndOfFile_AppendMode() { + return // WriteAt on O_APPEND files returns an error starting with Go 1.13 var err error var n int @@ -237,6 +238,7 @@ func (t *PosixTest) WriteAtDoesntChangeOffset_NotAppendMode() { } func (t *PosixTest) WriteAtDoesntChangeOffset_AppendMode() { + return // WriteAt on O_APPEND files returns an error starting with Go 1.13 var err error var n int @@ -269,6 +271,7 @@ func (t *PosixTest) WriteAtDoesntChangeOffset_AppendMode() { } func (t *PosixTest) AppendMode() { + return // WriteAt on O_APPEND files returns an error starting with Go 1.13 var err error var n int var off int64