[SCM] Samba Shared Repository - branch master updated

Ralph Böhme slow at samba.org
Sat Apr 11 12:25:04 UTC 2020


The branch, master has been updated
       via  eab086c5725 s4/torture: fix timeval wrap in torture_libsmbclient_utimes() test
      from  c4176b1cea4 Update WHATSNEW.txt to explain the vfs_widelinks module addition.

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


- Log -----------------------------------------------------------------
commit eab086c572596e9da042f1f68e0d8f0a375763c3
Author: Ralph Boehme <slow at samba.org>
Date:   Fri Apr 10 13:51:39 2020 +0200

    s4/torture: fix timeval wrap in torture_libsmbclient_utimes() test
    
    Fixes the following flapping test:
    
    UNEXPECTED(failure): samba4.libsmbclient.utimes.SMB3.utimes(nt4_dc)
    REASON: Exception: Exception: ../../source4/torture/libsmbclient/libsmbclient.c:1249:
        st.st_mtim.tv_nsec / 1000 was 98181 (0x17F85),
        expected 1098181 (0x10C1C5): smbc_utimes did not update msec
    
    https://gitlab.com/samba-team/devel/samba/-/jobs/506361470
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Sat Apr 11 12:24:00 UTC 2020 on sn-devel-184

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

Summary of changes:
 source4/torture/libsmbclient/libsmbclient.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c
index b09dde23c32..18a1af3164b 100644
--- a/source4/torture/libsmbclient/libsmbclient.c
+++ b/source4/torture/libsmbclient/libsmbclient.c
@@ -1234,7 +1234,7 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx)
 	tbuf[0] = convert_timespec_to_timeval(st.st_atim);
 	tbuf[1] = convert_timespec_to_timeval(st.st_mtim);
 
-	tbuf[1].tv_usec += 100000; /* 100 msec */
+	tbuf[1] = timeval_add(&tbuf[1], 0, 100000); /* 100 msec */
 
 	ret = smbc_utimes(smburl, tbuf);
 	torture_assert_int_not_equal(tctx, ret, -1, "smbc_utimes failed");


-- 
Samba Shared Repository



More information about the samba-cvs mailing list