Remove obsolete tests and fix existing tests.

[philipp/winterrodeln/wradmin.git] / tests / test_lib.py

diff --git a/tests/test_lib.py b/tests/test_lib.py
index f73fc537c865658fdf62233cbdc77f942a05fca6..a7fb33db9d26e72f862923d7b09cfe0fac07e85a 100644 (file)
--- a/tests/test_lib.py
+++ b/tests/test_lib.py
@@ -1,24 +1,17 @@
 #!/usr/bin/python3.4
 # $Id$
 import unittest
-import wradmin.lib
-import wradmin.lib.mediawiki
-import wradmin.model
+import wradmin.auth
 
 
 class TestMediaWikiUsers(unittest.TestCase):
 
-    @unittest.skip
-    def test_mediawiki_users(self):
-        users = wradmin.lib.mediawiki.MediaWikiUsers(True)
-        assert len(users.usernames) >= 1 # We have at least one user
-
     def test_mediawiki_users_has_password_is_correct_b(self):
         password_db = ':B:d25b2886:41e46c952790b1b442aac4f24f7ea7a8'  # 'abc'
-        self.assertTrue(wradmin.lib.mediawiki.MediaWikiUsers.password_is_correct('abc', password_db))
-        self.assertFalse(wradmin.lib.mediawiki.MediaWikiUsers.password_is_correct('abcd', password_db))
+        self.assertTrue(wradmin.auth.password_is_correct('abc', password_db))
+        self.assertFalse(wradmin.auth.password_is_correct('abcd', password_db))
 
     def test_mediawiki_users_has_password_is_correct_pbkdf2(self):
         password_db = ':pbkdf2:sha256:10000:128:EXgVGhc2mAs710feKvkiaw==:J5fYth9pg/R2d0F8bSsYfTR8SBpTBNIcdv/DgJ0tOPC1rtajl2Dr0RLqOozLb8O0XpDhtv4a3JJd/M0b58WebfNWAcdJBJI9nNeC0EYYD7OCYZGVAaRhiYtK4m53KZBBL6x/k2j4RjHPT1NmgV8Fr1DPqBNOlOHxUIh5z5oslM4='  # 'abc'
-        self.assertTrue(wradmin.lib.mediawiki.MediaWikiUsers.password_is_correct('abc', password_db))
-        self.assertFalse(wradmin.lib.mediawiki.MediaWikiUsers.password_is_correct('abcd', password_db))
+        self.assertTrue(wradmin.auth.password_is_correct('abc', password_db))
+        self.assertFalse(wradmin.auth.password_is_correct('abcd', password_db))