diff email_list/tests/test_models.py @ 169:5ab9bd1b22b6

Merge.
author Brian Neal <bgneal@gmail.com>
date Thu, 02 Apr 2015 21:05:58 -0500
parents 1b5b9be17764
children
line wrap: on
line diff
--- a/email_list/tests/test_models.py	Thu Apr 02 21:04:08 2015 -0500
+++ b/email_list/tests/test_models.py	Thu Apr 02 21:05:58 2015 -0500
@@ -21,8 +21,8 @@
 
         self.assertTrue(sub.status == 'A')
         self.assertTrue(sub.is_active())
-        self.failIf(sub.is_pending())
-        self.failIf(sub.is_leaving())
+        self.assertFalse(sub.is_pending())
+        self.assertFalse(sub.is_leaving())
 
     def test_set_pending(self):
 
@@ -33,9 +33,9 @@
         self.assertTrue(now - sub.status_date < datetime.timedelta(seconds=2))
 
         self.assertTrue(sub.status == 'P')
-        self.failIf(sub.is_active())
+        self.assertFalse(sub.is_active())
         self.assertTrue(sub.is_pending())
-        self.failIf(sub.is_leaving())
+        self.assertFalse(sub.is_leaving())
 
         self.assertTrue(len(sub.key) == sub.key_length)
 
@@ -49,8 +49,8 @@
 
         self.assertTrue(sub.status == 'A')
         self.assertTrue(sub.is_active())
-        self.failIf(sub.is_pending())
-        self.failIf(sub.is_leaving())
+        self.assertFalse(sub.is_pending())
+        self.assertFalse(sub.is_leaving())
 
     def test_set_leaving(self):
 
@@ -61,8 +61,8 @@
         self.assertTrue(now - sub.status_date < datetime.timedelta(seconds=2))
 
         self.assertTrue(sub.status == 'L')
-        self.failIf(sub.is_active())
-        self.failIf(sub.is_pending())
+        self.assertFalse(sub.is_active())
+        self.assertFalse(sub.is_pending())
         self.assertTrue(sub.is_leaving())
 
         self.assertTrue(len(sub.key) == sub.key_length)