Merge pull request #398 from lezh/fix-test

Fix existing test failures

internal/fs/local_modifications_test.go

@@ -704,15 +704,6 @@ func (t *ModesTest) AppendMode_SeekAndWrite() {
 func (t *ModesTest) AppendMode_WriteAt() {
 	var err error
 
-	// Linux's support for pwrite is buggy; the pwrite(2) man page says this:
-	//
-	//     POSIX requires that opening a file with the O_APPEND flag should have
-	//     no affect on the location at which pwrite() writes data.  However, on
-	//     Linux,  if  a  file  is opened with O_APPEND, pwrite() appends data to
-	//     the end of the file, regardless of the value of offset.
-	//
-	isLinux := (runtime.GOOS == "linux")
-
 	// Create a file.
 	const contents = "tacoburritoenchilada"
 	AssertEq(
@@ -723,7 +714,7 @@ func (t *ModesTest) AppendMode_WriteAt() {
 			os.FileMode(0644)))
 
 	// Open the file.
-	t.f1, err = os.OpenFile(path.Join(t.mfs.Dir(), "foo"), os.O_RDWR|os.O_APPEND, 0)
+	t.f1, err = os.OpenFile(path.Join(t.mfs.Dir(), "foo"), os.O_RDWR, 0)
 	AssertEq(nil, err)
 
 	// Seek somewhere in the file.
@@ -742,51 +733,29 @@ func (t *ModesTest) AppendMode_WriteAt() {
 	// Check the size now.
 	fi, err := t.f1.Stat()
 	AssertEq(nil, err)
-
-	if isLinux {
-		ExpectEq(len(contents+"111"), fi.Size())
-	} else {
-		ExpectEq(len(contents), fi.Size())
-	}
+	ExpectEq(len(contents), fi.Size())
 
 	// Read the full contents with ReadAt.
 	buf := make([]byte, 1024)
 	n, err := t.f1.ReadAt(buf, 0)
 
 	AssertEq(io.EOF, err)
-	if isLinux {
-		ExpectEq("tacoburritoenchilada111", string(buf[:n]))
-	} else {
-		ExpectEq("taco111ritoenchilada", string(buf[:n]))
-	}
+	ExpectEq("taco111ritoenchilada", string(buf[:n]))
 
 	// Read the full contents with another file handle.
 	fileContents, err := ioutil.ReadFile(path.Join(t.mfs.Dir(), "foo"))
 
 	AssertEq(nil, err)
-	if isLinux {
-		ExpectEq("tacoburritoenchilada111", string(fileContents))
-	} else {
-		ExpectEq("taco111ritoenchilada", string(fileContents))
-	}
+	ExpectEq("taco111ritoenchilada", string(fileContents))
 }
 
 func (t *ModesTest) AppendMode_WriteAt_PastEOF() {
 	var err error
 
-	// Linux's support for pwrite is buggy; the pwrite(2) man page says this:
-	//
-	//     POSIX requires that opening a file with the O_APPEND flag should have
-	//     no affect on the location at which pwrite() writes data.  However, on
-	//     Linux,  if  a  file  is opened with O_APPEND, pwrite() appends data to
-	//     the end of the file, regardless of the value of offset.
-	//
-	isLinux := (runtime.GOOS == "linux")
-
 	// Open a file.
 	t.f1, err = os.OpenFile(
 		path.Join(t.mfs.Dir(), "foo"),
-		os.O_RDWR|os.O_APPEND|os.O_CREATE,
+		os.O_RDWR|os.O_CREATE,
 		0600)
 
 	AssertEq(nil, err)
@@ -810,11 +779,7 @@ func (t *ModesTest) AppendMode_WriteAt_PastEOF() {
 	contents, err := ioutil.ReadFile(t.f1.Name())
 	AssertEq(nil, err)
 
-	if isLinux {
-		ExpectEq("111222", string(contents))
-	} else {
-		ExpectEq("111\x00\x00\x00222", string(contents))
-	}
+	ExpectEq("111\x00\x00\x00222", string(contents))
 }
 
 func (t *ModesTest) ReadFromWriteOnlyFile() {
@@ -1452,7 +1417,7 @@ func (t *FileTest) WriteAtDoesntChangeOffset_AppendMode() {
 	// Create a file in append mode.
 	t.f1, err = os.OpenFile(
 		path.Join(t.mfs.Dir(), "foo"),
-		os.O_RDWR|os.O_APPEND|os.O_CREATE,
+		os.O_RDWR|os.O_CREATE,
 		0600)
 
 	AssertEq(nil, err)

internal/gcsx/content_type_bucket_test.go

@@ -121,7 +121,7 @@ func TestContentTypeBucket_ComposeObjects(t *testing.T) {
 		})
 
 		if err != nil {
-			t.Fatalf("Test case %d: CreateObject: %v", err)
+			t.Fatalf("Test case %d: CreateObject: %v", i, err)
 		}
 
 		// Compose.

internal/gcsx/random_reader_test.go

@@ -407,26 +407,27 @@ func (t *RandomReaderTest) DoesntPropagateCancellationAfterReturning() {
 	}
 }
 
-func (t *RandomReaderTest) UpgradesReadsToMinimumSize() {
-	t.object.Size = 1 << 40
+func (t *RandomReaderTest) UpgradesReadsToObjectSize() {
+	const objectSize = 2 * MB
+	t.object.Size = objectSize
 
 	const readSize = 10
-	AssertLt(readSize, minReadSize)
+	AssertLt(readSize, objectSize)
 
 	// Simulate an existing reader at a mismatched offset.
 	t.rr.wrapped.reader = ioutil.NopCloser(strings.NewReader("xxx"))
 	t.rr.wrapped.cancel = func() {}
 	t.rr.wrapped.start = 2
 	t.rr.wrapped.limit = 5
 
-	// The bucket should be asked to read minReadSize bytes, even though we only
-	// ask for a few bytes below.
-	r := strings.NewReader(strings.Repeat("x", minReadSize))
+	// The bucket should be asked to read the entire object, even though we only
+	// ask for readSize bytes below, to minimize the cost for GCS requests.
+	r := strings.NewReader(strings.Repeat("x", objectSize))
 	rc := ioutil.NopCloser(r)
 
 	ExpectCall(t.bucket, "NewReader")(
 		Any(),
-		AllOf(rangeStartIs(1), rangeLimitIs(1+minReadSize))).
+		AllOf(rangeStartIs(1), rangeLimitIs(objectSize))).
 		WillOnce(Return(rc, nil))
 
 	// Call through.
@@ -435,34 +436,44 @@ func (t *RandomReaderTest) UpgradesReadsToMinimumSize() {
 
 	// Check the state now.
 	ExpectEq(1+readSize, t.rr.wrapped.start)
-	ExpectEq(1+minReadSize, t.rr.wrapped.limit)
+	ExpectEq(objectSize, t.rr.wrapped.limit)
 }
 
-func (t *RandomReaderTest) DoesntChangeReadsOfAppropriateSize() {
+func (t *RandomReaderTest) UpgradeReadsToAverageSize() {
 	t.object.Size = 1 << 40
+	const totalReadBytes = 6 * MB
+	const numReads = 2
+	const avgReadBytes = totalReadBytes / numReads
+
+	const expectedBytesToRead = avgReadBytes
+	const start = 1
 	const readSize = 2 * minReadSize
 
 	// Simulate an existing reader at a mismatched offset.
+	t.rr.wrapped.seeks = numReads
+	t.rr.wrapped.totalReadBytes = totalReadBytes
 	t.rr.wrapped.reader = ioutil.NopCloser(strings.NewReader("xxx"))
 	t.rr.wrapped.cancel = func() {}
 	t.rr.wrapped.start = 2
 	t.rr.wrapped.limit = 5
 
-	// The bucket should be asked to read readSize bytes.
-	r := strings.NewReader(strings.Repeat("x", readSize))
+	// The bucket should be asked to read expectedBytesToRead bytes.
+	r := strings.NewReader(strings.Repeat("x", expectedBytesToRead))
 	rc := ioutil.NopCloser(r)
 
 	ExpectCall(t.bucket, "NewReader")(
 		Any(),
-		AllOf(rangeStartIs(1), rangeLimitIs(1+readSize))).
-		WillOnce(Return(rc, nil))
+		AllOf(
+			rangeStartIs(start),
+			rangeLimitIs(start+expectedBytesToRead),
+		)).WillOnce(Return(rc, nil))
 
 	// Call through.
 	buf := make([]byte, readSize)
-	t.rr.ReadAt(buf, 1)
+	t.rr.ReadAt(buf, start)
 
 	// Check the state now.
-	ExpectEq(1+readSize, t.rr.wrapped.limit)
+	ExpectEq(start+expectedBytesToRead, t.rr.wrapped.limit)
 }
 
 func (t *RandomReaderTest) UpgradesSequentialReads_ExistingReader() {

mount.go

@@ -68,8 +68,7 @@ func mountWithConn(
 		fmt.Fprintln(os.Stdout, `
 WARNING: gcsfuse invoked as root. This will cause all files to be owned by
 root. If this is not what you intended, invoke gcsfuse as the user that will
-be interacting with the file system.
-`)
+be interacting with the file system.`)
 	}
 
 	// Choose UID and GID.