From c2192cfcade7b6a165f32a1b7471dfb765e86e00 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 30 Oct 2016 16:29:36 +0100
Subject: fusefrontend: drop atime workarounds

The fix at https://github.com/hanwen/go-fuse/pull/131 has been merged.
Drop the workarounds and re-enable the tests.
---
 tests/matrix/matrix_test.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go
index 8b80448..1af4a22 100644
--- a/tests/matrix/matrix_test.go
+++ b/tests/matrix/matrix_test.go
@@ -25,7 +25,6 @@ import (
 	"testing"
 
 	"github.com/rfjakob/gocryptfs/internal/cryptocore"
-	"github.com/rfjakob/gocryptfs/internal/fusefrontend"
 	"github.com/rfjakob/gocryptfs/internal/syscallcompat"
 	"github.com/rfjakob/gocryptfs/tests/test_helpers"
 )
@@ -686,18 +685,13 @@ func doTestUtimesNano(t *testing.T, path string) {
 		},
 		{
 			in:  [2]syscall.Timespec{{Sec: 7, Nsec: 8}, {Sec: 99, Nsec: _UTIME_OMIT}},
-			out: [2]syscall.Timespec{{Sec: 7, Nsec: 8}, {Sec: 5, Nsec: 6}},
+			out: [2]syscall.Timespec{{Sec: 7, Nsec: 8}, {Sec: 3, Nsec: 4}},
 		},
 		{
 			in:  [2]syscall.Timespec{{Sec: 99, Nsec: _UTIME_OMIT}, {Sec: 5, Nsec: 6}},
-			out: [2]syscall.Timespec{{Sec: 1, Nsec: 2}, {Sec: 5, Nsec: 6}},
+			out: [2]syscall.Timespec{{Sec: 7, Nsec: 8}, {Sec: 5, Nsec: 6}},
 		},
 	}
-	if fusefrontend.BrokenAtime {
-		// TODO remove this once the pull request is merged:
-		// https://github.com/hanwen/go-fuse/pull/131
-		utimeTestcases = utimeTestcases[:1]
-	}
 	for i, tc := range utimeTestcases {
 		err := syscall.UtimesNano(path, tc.in[:])
 		if err != nil {
-- 
cgit v1.2.3