#16919: test_crypt now works with unittest test discovery. Patch by Zachary Ware.
diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py
index dc107d8..cfb7341 100644
--- a/Lib/test/test_crypt.py
+++ b/Lib/test/test_crypt.py
@@ -1,7 +1,11 @@
from test import support
import unittest
-crypt = support.import_module('crypt')
+def setUpModule():
+ # this import will raise unittest.SkipTest if _crypt doesn't exist,
+ # so it has to be done in setUpModule for test discovery to work
+ global crypt
+ crypt = support.import_module('crypt')
class CryptTestCase(unittest.TestCase):
@@ -29,8 +33,5 @@
self.assertTrue(len(crypt.methods) >= 1)
self.assertEqual(crypt.METHOD_CRYPT, crypt.methods[-1])
-def test_main():
- support.run_unittest(CryptTestCase)
-
if __name__ == "__main__":
- test_main()
+ unittest.main()