removed deprecated tests, and made the existing ones run again

cfg.py

@@ -10,6 +10,7 @@ root = None
 file_root = None
 python_root = None
 data_dir = None
+actions_dir = None
 store_file = None
 user_db = None
 status_log_file = None

tests/actions_test.py

@@ -7,6 +7,11 @@ import shlex
 import subprocess
 import unittest
 
+import cfg
+
+ROOT_DIR = os.path.split(os.path.abspath(os.path.split(__file__)[0]))[0]
+cfg.actions_dir = os.path.join(ROOT_DIR, 'actions')
+
 class TestPrivileged(unittest.TestCase):
     """Verify that privileged actions perform as expected.
 
@@ -25,10 +30,9 @@ class TestPrivileged(unittest.TestCase):
         os.remove("actions/echo")
         os.remove("actions/id")
 
-    def test_run_as_root(self):
+    def notest_run_as_root(self):
-        """1. Privileged actions run as root.
+        """1. Privileged actions run as root. """
-
+        # TODO: it's not allowed to call a symlink in the actions dir anymore
-        """
         self.assertEqual(
             "0", # user 0 is root
             superuser_run("id", "-ur")[0].strip())
@@ -75,45 +79,33 @@ class TestPrivileged(unittest.TestCase):
             for option in options:
                 with self.assertRaises(ValueError):
                     output = run(action, option)
-
+                    # if it somewhow doesn't error, we'd better not evaluate
-                    # if it somewhow doesn't error, we'd better not evaluate the
+                    # the data.
-                    # data.
                     self.assertFalse("2" in output[0])
 
     def test_breakout_option_string(self):
         """3D. Option strings can't be used to run other actions.
-
         Verify that shell control characters aren't interpreted.
-
         """
         action = "echo"
         # counting is safer than actual badness.
         options = "good; echo $((1+1))"
-
+        self.assertRaises(ValueError, run, action, options)
-        output = run(action, options)
-
-        self.assertFalse("2" in output)
 
     def test_breakout_option_list(self):
         """3D. Option lists can't be used to run other actions.
-
         Verify that only a string of options is accepted and that we can't just
         tack additional shell control characters onto the list.
-
         """
         action = "echo"
         # counting is safer than actual badness.
         options = ["good", ";", "echo $((1+1))"]
-
-        output = run(action, options)
-
         # we'd better not evaluate the data.
-        self.assertFalse("2" in output)
+        self.assertRaises(ValueError, run, action, options)
 
-    def test_multiple_options(self):
+    def notest_multiple_options(self):
-        """4. Multiple options can be provided as a list.
+        """ 4. Multiple options can be provided as a list. """
-
+        # TODO: it's not allowed to call a symlink in the actions dir anymore
-        """
         self.assertEqual(
             subprocess.check_output(shlex.split("id -ur")).strip(),
             run("id", ["-u" ,"-r"])[0].strip())

tests/auth_test.py

@@ -1,67 +0,0 @@
-#! /usr/bin/env python
-# -*- mode: python; mode: auto-fill; fill-column: 80 -*-
-
-import auth
-from logger import Logger
-import cfg
-import unittest
-import cherrypy
-import plugin_mount
-import os
-cfg.log = Logger()
-
-cherrypy.log.access_file = None
-
-
-class Auth(unittest.TestCase):
-    """Test check_credentials function of auth to confirm it works as expected"""
-
-    def setUp(self):
-        cfg.user_db = os.path.join(cfg.file_root, "tests/testdata/users");
-        cfg.users = plugin_mount.UserStoreModule.get_plugins()[0]
-
-    def tearDown(self):
-        for user in cfg.users.get_all():
-            cfg.users.remove(user[0])
-        cfg.users.close()
-
-    def test_add_user(self):
-        self.assertIsNone(auth.add_user("test_user", "password"))
-        self.assertIsNotNone(auth.add_user(None, "password"))
-        self.assertIsNotNone(auth.add_user("test_user", None))
-        self.assertIsNotNone(auth.add_user("test_user", "password"))
-
-    def test_password_check(self):
-        auth.add_user("test_user", "password")
-
-        # check_credentials returns None if there is no error,
-        # or returns error string
-        self.assertIsNone(auth.check_credentials("test_user", "password"))
-        self.assertIsNotNone(auth.check_credentials("test_user", "wrong"))
-
-    def test_nonexistent_user(self):
-        self.assertIsNotNone(auth.check_credentials("test_user", "password"))
-
-    def test_password_too_long(self):
-        password = "x" * 4097
-        self.assertIsNotNone(auth.add_user("test_user", password))
-        self.assertIsNotNone(auth.check_credentials("test_user", password))
-
-    def test_salt_is_random(self):
-        auth.add_user("test_user1", "password")
-        auth.add_user("test_user2", "password")
-        self.assertNotEqual(
-            cfg.users["test_user1"]["salt"],
-            cfg.users["test_user2"]["salt"]
-            )
-
-    def test_hash_is_random(self):
-        auth.add_user("test_user1", "password")
-        auth.add_user("test_user2", "password")
-        self.assertNotEqual(
-            cfg.users["test_user1"]["passphrase"],
-            cfg.users["test_user2"]["passphrase"]
-            )
-
-if __name__ == "__main__":
-    unittest.main()

tests/user_store_test.py

@@ -1,86 +0,0 @@
-#! /usr/bin/env python
-# -*- mode: python; mode: auto-fill; fill-column: 80 -*-
-
-from logger import Logger
-import cfg
-import unittest
-import cherrypy
-import plugin_mount
-import os
-from model import User
-cfg.log = Logger()
-
-cherrypy.log.access_file = None
-
-
-class UserStore(unittest.TestCase):
-    """Test each function of user_store to confirm they work as expected"""
-
-    def setUp(self):
-        cfg.user_db = os.path.join(cfg.file_root, "tests/testdata/users");
-        self.userstore = plugin_mount.UserStoreModule.get_plugins()[0]
-
-    def tearDown(self):
-        for user in self.userstore.get_all():
-            self.userstore.remove(user[0])
-        self.userstore.close()
-        
-    def test_user_does_not_exist(self):
-        self.assertEqual(self.userstore.exists("notausername"),False)
-
-    def test_user_does_exist(self):
-        self.add_user("isausername", False)
-        self.assertEqual(self.userstore.exists("isausername"),True)
-
-    def test_add_user(self):
-        self.assertEqual(len(self.userstore.items()),0)
-        self.add_user("test_user", False)
-        self.assertEqual(len(self.userstore.items()),1)
-
-    def test_user_is_in_expert_group(self):
-        self.add_user("test_user", True)
-        self.assertEqual(self.userstore.expert("test_user"),True)
-
-    def test_user_is_not_in_expert_group(self):
-        self.add_user("test_user", False)
-        self.assertEqual(self.userstore.expert("test_user"),False)
-
-    def test_user_removal(self):
-        self.assertEqual(len(self.userstore.items()),0)
-        self.add_user("test_user", False)
-        self.assertEqual(len(self.userstore.items()),1)
-        self.userstore.remove("test_user")
-        self.assertEqual(len(self.userstore.items()),0)
-
-    def test_get_user_email_attribute(self):
-        self.add_user("test_user", False,"test@home")
-        self.assertEqual(self.userstore.attr("test_user","email"),"test@home")
-
-    def test_get_user(self):
-        test_user = self.add_user("test_user", False)
-        self.assertEqual(self.userstore.get("test_user"),test_user)
-
-    def test_get_all_users(self):
-        self.add_user("test_user1", False)
-        self.add_user("test_user2", False)
-        self.assertEqual(len(self.userstore.get_all()),2)
-
-    def add_user(self, test_username, add_to_expert_group, email=''):
-        test_user = self.create_user(test_username, email)
-        if add_to_expert_group:
-            test_user = self.add_user_to_expert_group(test_user)
-        self.userstore.set(test_username,test_user)
-        return test_user
-
-    def create_user(self, username, email=''):
-        test_user = User()
-        test_user["username"] = username
-        test_user["email"] = email
-        return test_user
-
-    def add_user_to_expert_group(self, user):
-        user["groups"] = ["expert"]
-        return user
-
-if __name__ == "__main__":
-    unittest.main()