s3:torture: relax TRANS2 midmight time checking

It's possible that the test runs on a full hour, e.g. Tue Sep  6 03:00:00 2011.

So better check that the a_time is different from the current time.

metze

1 files changed, 4 insertions, 2 deletions

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 888bcb1c86..f07026d17a 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3323,18 +3323,20 @@ static bool run_trans2test(int dummy)
 		printf("ERROR: qpathinfo failed (%s)\n", nt_errstr(status));
 		correct = False;
 	} else {
+		time_t t = time(NULL);
+
 		if (c_time != m_time) {
 			printf("create time=%s", ctime(&c_time));
 			printf("modify time=%s", ctime(&m_time));
 			printf("This system appears to have sticky create times\n");
 		}
-		if (a_time % (60*60) == 0) {
+		if ((abs(a_time - t) > 60) && (a_time % (60*60) == 0)) {
 			printf("access time=%s", ctime(&a_time));
 			printf("This system appears to set a midnight access time\n");
 			correct = False;
 		}
 
-		if (abs(m_time - time(NULL)) > 60*60*24*7) {
+		if (abs(m_time - t) > 60*60*24*7) {
 			printf("ERROR: totally incorrect times - maybe word reversed? mtime=%s", ctime(&m_time));
 			correct = False;
 		}