[SCM] Samba Shared Repository - branch master updated

Amitay Isaacs amitay at samba.org
Thu Sep 6 06:34:02 UTC 2018


The branch, master has been updated
       via  bc62182 ctdb-tests: Check result of write() in ARP and TCP tests
      from  05862b7 s4/selftest: enable samba4.schemaInfo.python for py3

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bc62182ff46023494f710a78d5a57a7baffa8780
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Sep 5 12:42:07 2018 +1000

    ctdb-tests: Check result of write() in ARP and TCP tests
    
    CTDB -O3 --picky-developer build is failing.  Not sure how this
    slipped through.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Thu Sep  6 08:33:59 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 ctdb/tests/src/system_socket_test.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/tests/src/system_socket_test.c b/ctdb/tests/src/system_socket_test.c
index 6dd9e43..f7d0c7c 100644
--- a/ctdb/tests/src/system_socket_test.c
+++ b/ctdb/tests/src/system_socket_test.c
@@ -59,6 +59,7 @@ static void test_arp(const char *addr_str, const char *hwaddr_str, bool reply)
 	uint8_t buf[512];
 	size_t buflen = sizeof(buf);
 	size_t len;
+	ssize_t num_written;
 	int ret;
 
 	ret = ctdb_sock_addr_from_string(addr_str, &addr, false);
@@ -80,7 +81,8 @@ static void test_arp(const char *addr_str, const char *hwaddr_str, bool reply)
 
 	assert(ret == 0);
 
-	write(STDOUT_FILENO, buf, len);
+	num_written = write(STDOUT_FILENO, buf, len);
+	assert(num_written == len);
 }
 
 #else /* HAVE_PACKETSOCKET  */
@@ -104,6 +106,7 @@ static void test_tcp(const char *src_str,
 	uint8_t buf[512];
 	struct ether_header *eth;
 	size_t expected_len, len;
+	ssize_t num_written;
 	char src_str_out[64], dst_str_out[64];
 	uint32_t seq_out, ack_out;
 	int rst_out;
@@ -156,7 +159,10 @@ static void test_tcp(const char *src_str,
 	assert(ret == 0);
 	assert(len == expected_len);
 
-	write(STDOUT_FILENO, buf + sizeof(struct ether_header), len);
+	num_written = write(STDOUT_FILENO,
+			    buf + sizeof(struct ether_header),
+			    len);
+	assert(num_written == len);
 
 	switch (ntohs(eth->ether_type)) {
 	case ETHERTYPE_IP:


-- 
Samba Shared Repository



More information about the samba-cvs mailing list