From 08791d6ae18f5ab359be8ac5ba38c915ac80ad81 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 15 May 2018 12:26:03 +1200 Subject: [PATCH] selftest: Make setexpiry test much more reliable Rather than setting all the expiries and expecting that they will be done within 5 seconds, measure and check the time individually for each record. This should make this test much less prone to flapping. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13867 Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue May 15 23:58:17 CEST 2018 on sn-devel-144 (cherry picked from commit 5ebe3183fded1ab060ed60baeedeac859d0c137e) --- python/samba/tests/samba_tool/user.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py index 10e4f6cd839..0b84ee1f781 100644 --- a/python/samba/tests/samba_tool/user.py +++ b/python/samba/tests/samba_tool/user.py @@ -306,9 +306,9 @@ class UserCmdTestCase(SambaToolCmdTest): def test_setexpiry(self): - twodays = time.time() + (2 * 24 * 60 * 60) - for user in self.users: + twodays = time.time() + (2 * 24 * 60 * 60) + (result, out, err) = self.runsubcmd("user", "setexpiry", user["name"], "--days=2", "-H", "ldap://%s" % os.environ["DC_SERVER"], @@ -316,7 +316,6 @@ class UserCmdTestCase(SambaToolCmdTest): self.assertCmdSuccess(result, out, err, "Can we run setexpiry with names") self.assertIn("Expiry for user '%s' set to 2 days." % user["name"], out) - for user in self.users: found = self._find_user(user["name"]) expires = nttime2unix(int("%s" % found.get("accountExpires"))) -- 2.18.1