s3:torture: add samba3.smbtorture_s3.LOCAL-MESSAGING-FDPASS2a test.

This variant of the fdpass2 test tests the non-queuing fast path
by sending a message with only a very small payload.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index deed6e684efc9375be92e0803f048856db3dbc68..d83a6057e9954e092738fe2b467ce9179f90dd06 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -111,6 +111,7 @@ local_tests = [
     "LOCAL-MESSAGING-READ4",
     "LOCAL-MESSAGING-FDPASS1",
     "LOCAL-MESSAGING-FDPASS2",
+    "LOCAL-MESSAGING-FDPASS2a",
     "LOCAL-hex_encode_buf",
     "LOCAL-sprintf_append",
     "LOCAL-remove_duplicate_addrs2"]

diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index b12c8bed2af1e1c4ee763ccdc3551f1b1f918eee..19e515e19118d5540448f0db396a61c31c246c33 100644 (file)
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -119,6 +119,7 @@ bool run_messaging_read3(int dummy);
 bool run_messaging_read4(int dummy);
 bool run_messaging_fdpass1(int dummy);
 bool run_messaging_fdpass2(int dummy);
+bool run_messaging_fdpass2a(int dummy);
 bool run_oplock_cancel(int dummy);
 
 #endif /* __TORTURE_H__ */

diff --git a/source3/torture/test_messaging_fd_passing.c b/source3/torture/test_messaging_fd_passing.c
index fec7b2dbe6a74149a54aa7639cd5e7ab854cffc8..fde5c15e6308ef6c92deca428fcf43684d2fd4fe 100644 (file)
--- a/source3/torture/test_messaging_fd_passing.c
+++ b/source3/torture/test_messaging_fd_passing.c
@@ -377,3 +377,12 @@ bool run_messaging_fdpass2(int dummy)
 {
        return run_messaging_fdpass2_int(dummy, 1000*1000);
 }
+
+/**
+ * Variant of the FDPASS2 test that tests the non-queuing fast path
+ * with a small payload.
+ */
+bool run_messaging_fdpass2a(int dummy)
+{
+       return run_messaging_fdpass2_int(dummy, 1);
+}

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 4b957af3fc90539ccf0df9687cc4f69f35b59e6a..1a0adba98ff8154f9cccea9d9eb23395e7d6fcd7 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -9605,6 +9605,7 @@ static struct {
        { "LOCAL-MESSAGING-READ4", run_messaging_read4, 0 },
        { "LOCAL-MESSAGING-FDPASS1", run_messaging_fdpass1, 0 },
        { "LOCAL-MESSAGING-FDPASS2", run_messaging_fdpass2, 0 },
+       { "LOCAL-MESSAGING-FDPASS2a", run_messaging_fdpass2a, 0 },
        { "LOCAL-BASE64", run_local_base64, 0},
        { "LOCAL-RBTREE", run_local_rbtree, 0},
        { "LOCAL-MEMCACHE", run_local_memcache, 0},