Imported Debian patch 4.7.2-3

ipatests/test_ipapython/test_ipavalidate.py

@@ -19,72 +19,72 @@
 import sys
 sys.path.insert(0, ".")
 
+import unittest
 import pytest
 
 from ipapython import ipavalidate
 
 pytestmark = pytest.mark.tier0
 
-
-class TestValidate:
+class TestValidate(unittest.TestCase):
     def test_validEmail(self):
-        assert ipavalidate.Email("test@freeipa.org") is True
-        assert ipavalidate.Email("", notEmpty=False) is True
+        self.assertEqual(True, ipavalidate.Email("test@freeipa.org"))
+        self.assertEqual(True, ipavalidate.Email("", notEmpty=False))
 
     def test_invalidEmail(self):
-        assert ipavalidate.Email("test") is False
-        assert ipavalidate.Email("test@freeipa") is False
-        assert ipavalidate.Email("test@.com") is False
-        assert ipavalidate.Email("") is False
-        assert ipavalidate.Email(None) is False
+        self.assertEqual(False, ipavalidate.Email("test"))
+        self.assertEqual(False, ipavalidate.Email("test@freeipa"))
+        self.assertEqual(False, ipavalidate.Email("test@.com"))
+        self.assertEqual(False, ipavalidate.Email(""))
+        self.assertEqual(False, ipavalidate.Email(None))
 
     def test_validPlain(self):
-        assert ipavalidate.Plain("Joe User") is True
-        assert ipavalidate.Plain("Joe O'Malley") is True
-        assert ipavalidate.Plain("", notEmpty=False) is True
-        assert ipavalidate.Plain(None, notEmpty=False) is True
-        assert ipavalidate.Plain("JoeUser", allowSpaces=False) is True
-        assert ipavalidate.Plain("JoeUser", allowSpaces=True) is True
+        self.assertEqual(True, ipavalidate.Plain("Joe User"))
+        self.assertEqual(True, ipavalidate.Plain("Joe O'Malley"))
+        self.assertEqual(True, ipavalidate.Plain("", notEmpty=False))
+        self.assertEqual(True, ipavalidate.Plain(None, notEmpty=False))
+        self.assertEqual(True, ipavalidate.Plain("JoeUser", allowSpaces=False))
+        self.assertEqual(True, ipavalidate.Plain("JoeUser", allowSpaces=True))
 
     def test_invalidPlain(self):
-        assert ipavalidate.Plain("Joe (User)") is False
-        assert ipavalidate.Plain("Joe C. User") is False
-        assert ipavalidate.Plain("", notEmpty=True) is False
-        assert ipavalidate.Plain(None, notEmpty=True) is False
-        assert ipavalidate.Plain("Joe User", allowSpaces=False) is False
-        assert ipavalidate.Plain("Joe C. User") is False
+        self.assertEqual(False, ipavalidate.Plain("Joe (User)"))
+        self.assertEqual(False, ipavalidate.Plain("Joe C. User"))
+        self.assertEqual(False, ipavalidate.Plain("", notEmpty=True))
+        self.assertEqual(False, ipavalidate.Plain(None, notEmpty=True))
+        self.assertEqual(False, ipavalidate.Plain("Joe User", allowSpaces=False))
+        self.assertEqual(False, ipavalidate.Plain("Joe C. User"))
 
     def test_validString(self):
-        assert ipavalidate.String("Joe User") is True
-        assert ipavalidate.String("Joe O'Malley") is True
-        assert ipavalidate.String("", notEmpty=False) is True
-        assert ipavalidate.String(None, notEmpty=False) is True
-        assert ipavalidate.String("Joe C. User") is True
+        self.assertEqual(True, ipavalidate.String("Joe User"))
+        self.assertEqual(True, ipavalidate.String("Joe O'Malley"))
+        self.assertEqual(True, ipavalidate.String("", notEmpty=False))
+        self.assertEqual(True, ipavalidate.String(None, notEmpty=False))
+        self.assertEqual(True, ipavalidate.String("Joe C. User"))
 
     def test_invalidString(self):
-        assert ipavalidate.String("", notEmpty=True) is False
-        assert ipavalidate.String(None, notEmpty=True) is False
+        self.assertEqual(False, ipavalidate.String("", notEmpty=True))
+        self.assertEqual(False, ipavalidate.String(None, notEmpty=True))
 
     def test_validPath(self):
-        assert ipavalidate.Path("/") is True
-        assert ipavalidate.Path("/home/user") is True
-        assert ipavalidate.Path("../home/user") is True
-        assert ipavalidate.Path("", notEmpty=False) is True
-        assert ipavalidate.Path(None, notEmpty=False) is True
+        self.assertEqual(True, ipavalidate.Path("/"))
+        self.assertEqual(True, ipavalidate.Path("/home/user"))
+        self.assertEqual(True, ipavalidate.Path("../home/user"))
+        self.assertEqual(True, ipavalidate.Path("", notEmpty=False))
+        self.assertEqual(True, ipavalidate.Path(None, notEmpty=False))
 
     def test_invalidPath(self):
-        assert ipavalidate.Path("(foo)") is False
-        assert ipavalidate.Path("", notEmpty=True) is False
-        assert ipavalidate.Path(None, notEmpty=True) is False
+        self.assertEqual(False, ipavalidate.Path("(foo)"))
+        self.assertEqual(False, ipavalidate.Path("", notEmpty=True))
+        self.assertEqual(False, ipavalidate.Path(None, notEmpty=True))
 
     def test_validName(self):
-        assert ipavalidate.GoodName("foo") is True
-        assert ipavalidate.GoodName("1foo") is True
-        assert ipavalidate.GoodName("foo.bar") is True
-        assert ipavalidate.GoodName("foo.bar$") is True
+        self.assertEqual(True, ipavalidate.GoodName("foo"))
+        self.assertEqual(True, ipavalidate.GoodName("1foo"))
+        self.assertEqual(True, ipavalidate.GoodName("foo.bar"))
+        self.assertEqual(True, ipavalidate.GoodName("foo.bar$"))
 
     def test_invalidName(self):
-        assert ipavalidate.GoodName("foo bar") is False
-        assert ipavalidate.GoodName("foo%bar") is False
-        assert ipavalidate.GoodName("*foo") is False
-        assert ipavalidate.GoodName("$foo.bar$") is False
+        self.assertEqual(False, ipavalidate.GoodName("foo bar"))
+        self.assertEqual(False, ipavalidate.GoodName("foo%bar"))
+        self.assertEqual(False, ipavalidate.GoodName("*foo"))
+        self.assertEqual(False, ipavalidate.GoodName("$foo.bar$"))