tests: improve SEEK_DATA test for MacOS
(1)
Create a 1 GiB file instead of 1 TiB, because
apparently, on MacOS, the file (sometimes?) is not
created sparse, and fills up users' disks:
https://github.com/rfjakob/gocryptfs/issues/625
(2)
On darwin, SEEK_DATA is not the same as on Linux
( 2f8b555de2
)
so use the value provided by the unix package.
This commit is contained in:
parent
4b251f3ce1
commit
700ae685cc
|
@ -14,6 +14,8 @@ import (
|
||||||
"syscall"
|
"syscall"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
|
|
||||||
"github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
|
"github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -267,15 +269,15 @@ func TestCpWarnings(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestSeekData tests that fs.FileLseeker is implemented
|
// TestSeekData tests that SEEK_DATA works
|
||||||
func TestSeekData(t *testing.T) {
|
func TestSeekData(t *testing.T) {
|
||||||
fn := filepath.Join(test_helpers.DefaultPlainDir, t.Name())
|
fn := filepath.Join(test_helpers.DefaultPlainDir, t.Name())
|
||||||
f, err := os.Create(fn)
|
f, err := os.Create(fn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
var oneTiB int64 = 1024 * 1024 * 1024 * 1024
|
var dataOffset int64 = 1024 * 1024 * 1024 // 1 GiB
|
||||||
if _, err = f.Seek(oneTiB, 0); err != nil {
|
if _, err = f.Seek(dataOffset, 0); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if _, err = f.Write([]byte("foo")); err != nil {
|
if _, err = f.Write([]byte("foo")); err != nil {
|
||||||
|
@ -283,18 +285,16 @@ func TestSeekData(t *testing.T) {
|
||||||
}
|
}
|
||||||
f.Close()
|
f.Close()
|
||||||
|
|
||||||
const SEEK_DATA = 3
|
|
||||||
|
|
||||||
f, err = os.Open(fn)
|
f, err = os.Open(fn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
off, err := f.Seek(1024*1024, SEEK_DATA)
|
off, err := f.Seek(1024*1024, unix.SEEK_DATA)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if off < oneTiB-1024*1024 {
|
if off < dataOffset-1024*1024 {
|
||||||
t.Errorf("off=%d, expected=%d\n", off, oneTiB)
|
t.Errorf("off=%d, expected=%d\n", off, dataOffset)
|
||||||
}
|
}
|
||||||
f.Close()
|
f.Close()
|
||||||
}
|
}
|
||||||
|
|
|
@ -259,7 +259,7 @@ func TestStatfs(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestSeekData tests that fs.FileLseeker is implemented
|
// TestSeekData tests that SEEK_DATA works
|
||||||
func TestSeekData(t *testing.T) {
|
func TestSeekData(t *testing.T) {
|
||||||
if !plaintextnames {
|
if !plaintextnames {
|
||||||
t.Skip()
|
t.Skip()
|
||||||
|
@ -270,8 +270,8 @@ func TestSeekData(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
var oneTiB int64 = 1024 * 1024 * 1024 * 1024
|
var dataOffset int64 = 1 * 1024 * 1024 * 1024 // 1 GiB
|
||||||
if _, err = f.Seek(oneTiB, 0); err != nil {
|
if _, err = f.Seek(dataOffset, 0); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if _, err = f.Write([]byte("foo")); err != nil {
|
if _, err = f.Write([]byte("foo")); err != nil {
|
||||||
|
@ -279,19 +279,17 @@ func TestSeekData(t *testing.T) {
|
||||||
}
|
}
|
||||||
f.Close()
|
f.Close()
|
||||||
|
|
||||||
const SEEK_DATA = 3
|
|
||||||
|
|
||||||
fn2 := filepath.Join(dirB, t.Name())
|
fn2 := filepath.Join(dirB, t.Name())
|
||||||
f, err = os.Open(fn2)
|
f, err = os.Open(fn2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
off, err := f.Seek(1024*1024, SEEK_DATA)
|
off, err := f.Seek(1024*1024, unix.SEEK_DATA)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if off < oneTiB-1024*1024 {
|
if off < dataOffset-1024*1024 {
|
||||||
t.Errorf("off=%d, expected=%d\n", off, oneTiB)
|
t.Errorf("off=%d, expected=%d\n", off, dataOffset)
|
||||||
}
|
}
|
||||||
f.Close()
|
f.Close()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue