traffic: new version of model with packet_rate, version number
[samba.git] / python / samba / tests / pam_winbind_warn_pwd_expire.py
index 2567f98c6d4a181ab682d8109748dabb5941ba80..df60bc5ace67c8ddd96c0ec2525aa091c9cc179d 100644 (file)
@@ -20,6 +20,7 @@ import samba.tests
 import pypamtest
 import os
 
+
 class PasswordExpirePamTests(samba.tests.TestCase):
     def test_auth_expire_warning(self):
         domain = os.environ["DOMAIN"]
@@ -27,18 +28,19 @@ class PasswordExpirePamTests(samba.tests.TestCase):
         password = os.environ["PASSWORD"]
         warn_pwd_expire = int(os.environ["WARN_PWD_EXPIRE"])
         unix_username = "%s/%s" % (domain, username)
-        expected_rc = 0 # PAM_SUCCESS
+        expected_rc = 0  # PAM_SUCCESS
 
         tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rc)
         res = pypamtest.run_pamtest(unix_username, "samba", [tc], [password])
 
-        self.assertTrue(res != None)
+        self.assertTrue(res is not None)
         if warn_pwd_expire == 0:
             self.assertTrue(res.info == ())
         elif warn_pwd_expire == 50:
-            # This is needed as otherwise a build started just before
+            # This is needed as otherwise a build started around
             # midnight can fail
-            if (res.info[0] != u"Your password will expire in 41 days"):
+            if (res.info[0] != u"Your password will expire in 41 days.\n") and \
+               (res.info[0] != u"Your password will expire in 43 days.\n"):
                 self.assertEqual(res.info[0], u"Your password will expire in 42 days.\n")
         else:
             self.assertEqual(warn_pwd_expire, 0)