git.samba.org
/
kai
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment the delay write time tests so I know what they're
[kai/samba.git]
/
source4
/
torture
/
basic
/
delaywrite.c
diff --git
a/source4/torture/basic/delaywrite.c
b/source4/torture/basic/delaywrite.c
index 13319681bd2c5303b6eff2d6b31942b07aa7ad61..af42beb5353a051a73a5caebed6162444dfb0ae6 100644
(file)
--- a/
source4/torture/basic/delaywrite.c
+++ b/
source4/torture/basic/delaywrite.c
@@
-1612,6
+1612,11
@@
static bool test_delayed_write_update3(struct torture_context *tctx,
return ret;
}
return ret;
}
+/*
+ * Show that a truncate write always updates the write time even
+ * if an initial write has already updated the write time.
+ */
+
static bool test_delayed_write_update3a(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
static bool test_delayed_write_update3a(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@
-1819,6
+1824,11
@@
static bool test_delayed_write_update3a(struct torture_context *tctx,
return ret;
}
return ret;
}
+/*
+ * Show a close after write updates the write timestamp to
+ * the close time, not the last write time.
+ */
+
static bool test_delayed_write_update3b(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
static bool test_delayed_write_update3b(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@
-1979,6
+1989,13
@@
static bool test_delayed_write_update3b(struct torture_context *tctx,
return ret;
}
return ret;
}
+/*
+ * Check that a write after a truncate write doesn't update
+ * the timestamp, but a truncate write after a write does.
+ * Also prove that a close after a truncate write updates the
+ * timestamp to current, not the time of last write.
+ */
+
static bool test_delayed_write_update3c(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
static bool test_delayed_write_update3c(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@
-2184,6
+2201,12
@@
static bool test_delayed_write_update3c(struct torture_context *tctx,
return ret;
}
return ret;
}
+/*
+ * Show only the first write updates the timestamp, and a close
+ * after writes updates to current (I think this is the same
+ * as test 3b. JRA).
+ */
+
static bool test_delayed_write_update4(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
static bool test_delayed_write_update4(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@
-2341,6
+2364,10
@@
static bool test_delayed_write_update4(struct torture_context *tctx,
return ret;
}
return ret;
}
+/*
+ * Show writes and closes have no effect on updating times once a SETWRITETIME is done.
+ */
+
static bool test_delayed_write_update5(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
static bool test_delayed_write_update5(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@
-2499,6
+2526,10
@@
static bool test_delayed_write_update5(struct torture_context *tctx,
return ret;
}
return ret;
}
+/*
+ * Show truncate writes and closes have no effect on updating times once a SETWRITETIME is done.
+ */
+
static bool test_delayed_write_update5b(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
static bool test_delayed_write_update5b(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@
-2596,7
+2627,7
@@
static bool test_delayed_write_update5b(struct torture_context *tctx,
torture_comment(tctx, "Server did not update write_time (correct)\n");
}
torture_comment(tctx, "Server did not update write_time (correct)\n");
}
- /*
sure any further write (truncates) update the write time
*/
+ /*
Do any further write (truncates) update the write time ?
*/
start = timeval_current();
end = timeval_add(&start, 15 * sec, 0);
while (!timeval_expired(&end)) {
start = timeval_current();
end = timeval_add(&start, 15 * sec, 0);
while (!timeval_expired(&end)) {
@@
-2657,6
+2688,14
@@
static bool test_delayed_write_update5b(struct torture_context *tctx,
return ret;
}
return ret;
}
+/*
+ * Open 2 handles on a file. Write one one and then set the
+ * WRITE TIME explicitly on the other. Ensure the write time
+ * update is cancelled. Ensure the write time is updated to
+ * the close time when the non-explicit set handle is closed.
+ *
+ */
+
static bool test_delayed_write_update6(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
static bool test_delayed_write_update6(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@
-2852,8
+2891,7
@@
again:
return ret;
}
return ret;
}
-
-/*
+/*
testing of delayed update of write_time
*/
struct torture_suite *torture_delay_write(void)
testing of delayed update of write_time
*/
struct torture_suite *torture_delay_write(void)