diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2018-05-15 12:26:03 +1200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-04-02 15:16:10 +0000 |
| commit | 501e28cc8d6e818357e5954fa66168244f4cb7e2 (patch) | |
| tree | 007ff162d9c2c7dd04481e6fac1e1d702b8384b8 | |
| parent | d1484add1fc9c498f65d6afb25a2eff00f2a6df6 (diff) | |
| download | samba-501e28cc8d6e818357e5954fa66168244f4cb7e2.tar.gz | |
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 <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue May 15 23:58:17 CEST 2018 on sn-devel-144
(cherry picked from commit 5ebe3183fded1ab060ed60baeedeac859d0c137e)
Autobuild-User(v4-8-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-8-test): Tue Apr 2 15:16:10 UTC 2019 on sn-devel-144
| -rw-r--r-- | python/samba/tests/samba_tool/user.py | 5 |
1 files 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"))) |