Fix/few more tests

README.md

@@ -111,8 +111,11 @@ run wsgidav server:
 
     tracimcli webdav start
 
+
 ## Run Tests and others checks ##
 
+### Run Tests ###
+
 Before running some functional test related to email, you need a local working *MailHog*
 see here : https://github.com/mailhog/MailHog
 

tests_configs.ini

@@ -5,6 +5,14 @@ depot_storage_dir = /tmp/test/depot
 user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
 
+[app:command_test]
+use = egg:tracim_backend
+sqlalchemy.url = sqlite:///tracim_test.sqlite
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+
 [mail_test]
 sqlalchemy.url = sqlite:///:memory:
 depot_storage_name = test
@@ -54,4 +62,4 @@ email.processing_mode = async
 email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
-email.notification.smtp.password = just_a_password
+email.notification.smtp.password = just_a_password

tracim/command/__init__.py

@@ -9,7 +9,7 @@
 
 from pyramid.paster import bootstrap
 from pyramid.scripting import AppEnvironment
-from tracim.exceptions import CommandAbortedError
+from tracim.exceptions import BadCommandError
 from tracim.lib.utils.utils import DEFAULT_TRACIM_CONFIG_FILE
 
 
@@ -56,6 +56,7 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
                 with app_context['request'].tm:
                     self.take_app_action(parsed_args, app_context)
 
+
     def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super(AppContextCommand, self).get_parser(prog_name)
 

tracim/command/user.py

@@ -3,17 +3,15 @@
 from pyramid.scripting import AppEnvironment
 import transaction
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm.exc import NoResultFound
 
 from tracim import CFG
 from tracim.command import AppContextCommand
 from tracim.command import Extender
-#from tracim.lib.auth.ldap import LDAPAuth
-#from tracim.lib.daemons import DaemonsManager
-#from tracim.lib.daemons import RadicaleDaemon
-#from tracim.lib.email import get_email_manager
-from tracim.exceptions import AlreadyExistError
+from tracim.exceptions import UserAlreadyExistError
+from tracim.exceptions import GroupDoesNotExist
 from tracim.exceptions import NotificationNotSend
-from tracim.exceptions import CommandAbortedError
+from tracim.exceptions import BadCommandError
 from tracim.lib.core.group import GroupApi
 from tracim.lib.core.user import UserApi
 from tracim.models import User
@@ -85,13 +83,22 @@ def _user_exist(self, login: str) -> User:
         return self._user_api.user_with_email_exists(login)
 
     def _get_group(self, name: str) -> Group:
+        groups_availables = [group.group_name
+                             for group in self._group_api.get_all()]
+        if name not in groups_availables:
+            msg = "Group '{}' does not exist, choose a group name in : ".format(name)  # nopep8
+            for group in groups_availables:
+                msg+= "'{}',".format(group)
+            self._session.rollback()
+            raise GroupDoesNotExist(msg)
         return self._group_api.get_one_with_name(name)
 
     def _add_user_to_named_group(
             self,
             user: str,
             group_name: str
     ) -> None:
+
         group = self._get_group(group_name)
         if user not in group.users:
             group.users.append(user)
@@ -116,7 +123,7 @@ def _create_user(
     ) -> User:
         if not password:
             if self._password_required():
-                raise CommandAbortedError(
+                raise BadCommandError(
                     "You must provide -p/--password parameter"
                 )
             password = ''
@@ -135,7 +142,7 @@ def _create_user(
             self._user_api.execute_created_user_actions(user)
         except IntegrityError:
             self._session.rollback()
-            raise AlreadyExistError()
+            raise UserAlreadyExistError()
         except NotificationNotSend as exception:
             self._session.rollback()
             raise exception
@@ -182,10 +189,10 @@ def _proceed_user(self, parsed_args: argparse.Namespace) -> User:
                     password=parsed_args.password,
                     do_notify=parsed_args.send_email,
                 )
-            except AlreadyExistError:
-                raise CommandAbortedError("Error: User already exist (use `user update` command instead)")
+            except UserAlreadyExistError:
+                raise UserAlreadyExistError("Error: User already exist (use `user update` command instead)")
             except NotificationNotSend:
-                raise CommandAbortedError("Error: Cannot send email notification, user not created.")
+                raise NotificationNotSend("Error: Cannot send email notification, user not created.")
             # TODO - G.M - 04-04-2018 - [Email] Check this code
             # if parsed_args.send_email:
             #     email_manager = get_email_manager()
@@ -243,5 +250,5 @@ class UpdateUserCommand(UserCommand):
     action = UserCommand.ACTION_UPDATE
 
 
-class LDAPUserUnknown(CommandAbortedError):
+class LDAPUserUnknown(BadCommandError):
     pass

tracim/exceptions.py

@@ -25,15 +25,11 @@ class ConfigurationError(TracimError):
     pass
 
 
-class AlreadyExistError(TracimError):
+class UserAlreadyExistError(TracimError):
     pass
 
 
-class CommandError(TracimError):
-    pass
-
-
-class CommandAbortedError(CommandError):
+class BadCommandError(TracimError):
     pass
 
 
@@ -93,13 +89,17 @@ class WrongUserPassword(TracimException):
     pass
 
 
-class UserDoesNotExist(TracimException):
+class NotificationNotSend(TracimException):
     pass
 
 
-class UserNotFoundInTracimRequest(TracimException):
+class GroupDoesNotExist(TracimError):
     pass
 
 
-class NotificationNotSend(TracimException):
+class UserDoesNotExist(TracimException):
     pass
+
+
+class UserNotFoundInTracimRequest(TracimException):
+    pass

tracim/lib/core/group.py

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 import typing
 
+from sqlalchemy.orm.exc import NoResultFound
+
+from tracim.exceptions import GroupDoesNotExist
 from tracim import CFG
 
+
 __author__ = 'damien'
 
 from tracim.models.auth import Group, User
@@ -26,7 +30,18 @@ def _base_query(self) -> Query:
         return self._session.query(Group)
 
     def get_one(self, group_id) -> Group:
-        return self._base_query().filter(Group.group_id == group_id).one()
+        try:
+            group = self._base_query().filter(Group.group_id == group_id).one()
+            return group
+        except NoResultFound:
+            raise GroupDoesNotExist()
 
     def get_one_with_name(self, group_name) -> Group:
-        return self._base_query().filter(Group.group_name == group_name).one()
+        try:
+            group = self._base_query().filter(Group.group_name == group_name).one()
+            return group
+        except NoResultFound:
+            raise GroupDoesNotExist()
+
+    def get_all(self):
+        return self._base_query().order_by(Group.group_id).all()

tracim/tests/__init__.py

@@ -35,8 +35,9 @@ class FunctionalTest(unittest.TestCase):
     sqlalchemy_url = 'sqlite:///tracim_test.sqlite'
 
     def setUp(self):
+        logger._logger.setLevel('WARNING')
         DepotManager._clear()
-        settings = {
+        self.settings = {
             'sqlalchemy.url': self.sqlalchemy_url,
             'user.auth_token.validity': '604800',
             'depot_storage_dir': '/tmp/test/depot',
@@ -45,19 +46,24 @@ def setUp(self):
 
         }
         hapic.reset_context()
-        app = web({}, **settings)
-        self.init_database(settings)
+        self.engine = get_engine(self.settings)
+        DeclarativeBase.metadata.create_all(self.engine)
+        self.session_factory = get_session_factory(self.engine)
+        self.app_config = CFG(self.settings)
+        self.app_config.configure_filedepot()
+        self.init_database(self.settings)
+        DepotManager._clear()
+        self.run_app()
+
+    def run_app(self):
+        app = web({}, **self.settings)
         self.testapp = TestApp(app)
 
     def init_database(self, settings):
-        self.engine = get_engine(settings)
-        DeclarativeBase.metadata.create_all(self.engine)
-        session_factory = get_session_factory(self.engine)
-        app_config = CFG(settings)
         with transaction.manager:
-            dbsession = get_tm_session(session_factory, transaction.manager)
+            dbsession = get_tm_session(self.session_factory, transaction.manager)
             try:
-                fixtures_loader = FixturesLoader(dbsession, app_config)
+                fixtures_loader = FixturesLoader(dbsession, self.app_config)
                 fixtures_loader.loads(self.fixtures)
                 transaction.commit()
                 print("Database initialized.")
@@ -90,6 +96,12 @@ def init_database(self, settings):
         self.engine = get_engine(settings)
 
 
+class CommandFunctionalTest(FunctionalTest):
+
+    def run_app(self):
+        self.session = get_tm_session(self.session_factory, transaction.manager)
+
+
 class BaseTest(unittest.TestCase):
     """
     Pyramid default test.
@@ -99,6 +111,7 @@ class BaseTest(unittest.TestCase):
     config_section = 'base_test'
 
     def setUp(self):
+        logger._logger.setLevel('WARNING')
         logger.debug(self, 'Setup Test...')
         self.settings = plaster.get_settings(
             self.config_uri,