Clean code and fix tests

tracim/test.ini

@@ -11,6 +11,7 @@ smtp_server = localhost
 error_email_from = turbogears@localhost
 radicale.server.port = 15232
 radicale.client.port = 15232
+radicale.server.filesystem.folder = /tmp/tracim_tests_radicale_fs
 
 [server:main]
 use = egg:gearbox#wsgiref
@@ -18,7 +19,7 @@ host = 127.0.0.1
 port = 8080
 
 [app:main]
-sqlalchemy.url = postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
+sqlalchemy.url = mysql+oursql://tracim:tracim@localhost/tracim_test
 use = config:development.ini
 
 [app:main_without_authn]
@@ -26,7 +27,7 @@ use = main
 skip_authentication = True
 
 [app:ldap]
-sqlalchemy.url = postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
+sqlalchemy.url = mysql+oursql://tracim:tracim@localhost/tracim_test
 auth_type = ldap
 ldap_url = ldap://localhost:3333
 ldap_base_dn = dc=directory,dc=fsf,dc=org
@@ -39,8 +40,7 @@ ldap_group_enabled = False
 use = config:development.ini
 
 [app:radicale]
-sqlalchemy.url = postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
-radicale.server.filesystem.folder = /tmp/tracim_tests_radicale_fs
+sqlalchemy.url = mysql+oursql://tracim:tracim@localhost/tracim_test
 use = config:development.ini
 
 # Add additional test specific configuration options as necessary.

tracim/tracim/lib/calendar.py

@@ -32,6 +32,43 @@ CALENDAR_WORKSPACE_URL_TEMPLATE = \
 
 
 class CalendarManager(object):
+    @staticmethod
+    def get_base_url():
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+
+        return CALENDAR_BASE_URL_TEMPLATE.format(
+            proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
+            domain=cfg.RADICALE_CLIENT_HOST or '127.0.0.1',
+            port=str(cfg.RADICALE_CLIENT_PORT)
+        )
+
+    @staticmethod
+    def get_user_calendar_url(user_id: int, extra: str=''):
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+
+        return CALENDAR_USER_URL_TEMPLATE.format(
+            proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
+            domain=cfg.RADICALE_CLIENT_HOST or '127.0.0.1',
+            port=str(cfg.RADICALE_CLIENT_PORT),
+            id=str(user_id),
+            extra=extra,
+        )
+
+    @staticmethod
+    def get_workspace_calendar_url(workspace_id: int, extra: str=''):
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+
+        return CALENDAR_WORKSPACE_URL_TEMPLATE.format(
+            proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
+            domain=cfg.RADICALE_CLIENT_HOST or '127.0.0.1',
+            port=str(cfg.RADICALE_CLIENT_PORT),
+            id=str(workspace_id),
+            extra=extra,
+        )
+
     def __init__(self, user: User):
         self._user = user
 
@@ -224,7 +261,15 @@ class CalendarManager(object):
             content: Content,
             event: iCalendarEvent,
             event_name: str,
-    ) -> Content:
+    ) -> None:
+        """
+        Populate Content content instance from iCalendarEvent event attributes.
+        :param content: content to populate
+        :param event: event with data to insert in content
+        :param event_name: Event name (ID) like
+        20160602T083511Z-18100-1001-1-71_Bastien-20160602T083516Z.ics
+        :return: given content
+        """
         content.label = event.get('summary')
         content.description = event.get('description')
         content.properties = {

tracim/tracim/tests/__init__.py

@@ -371,37 +371,3 @@ class TestCalendar(TestController):
                 shutil.rmtree('{0}/{1}'.format(radicale_fs_path, file))
         except FileNotFoundError:
             pass  # Dir not exists yet, no need to clear it
-
-    def _get_base_url(self):
-        from tracim.config.app_cfg import CFG
-        cfg = CFG.get_instance()
-
-        return CALENDAR_BASE_URL_TEMPLATE.format(
-            proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
-            domain=cfg.RADICALE_CLIENT_HOST or '127.0.0.1',
-            port=str(cfg.RADICALE_CLIENT_PORT)
-        )
-
-    def _get_user_calendar_url(self, user_id):
-        from tracim.config.app_cfg import CFG
-        cfg = CFG.get_instance()
-
-        return CALENDAR_USER_URL_TEMPLATE.format(
-            proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
-            domain=cfg.RADICALE_CLIENT_HOST or '127.0.0.1',
-            port=str(cfg.RADICALE_CLIENT_PORT),
-            id=user_id,
-            extra='',
-        )
-
-    def _get_workspace_calendar_url(self, workspace_id):
-        from tracim.config.app_cfg import CFG
-        cfg = CFG.get_instance()
-
-        return CALENDAR_WORKSPACE_URL_TEMPLATE.format(
-            proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
-            domain=cfg.RADICALE_CLIENT_HOST or '127.0.0.1',
-            port=str(cfg.RADICALE_CLIENT_PORT),
-            id=workspace_id,
-            extra='',
-        )

tracim/tracim/tests/functional/test_calendar.py

@@ -9,6 +9,7 @@ from requests.exceptions import ConnectionError
 from sqlalchemy.orm.exc import NoResultFound
 
 from tracim.config.app_cfg import daemons
+from tracim.lib.calendar import CalendarManager
 from tracim.lib.workspace import WorkspaceApi
 from tracim.model import DBSession
 from tracim.tests import TestCalendar as BaseTestCalendar
@@ -23,7 +24,7 @@ class TestCalendar(BaseTestCalendar):
         # ... radicale daemon started. We should lock something somewhere !
 
     def test_func__radicale_connectivity__ok__nominal_case(self):
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
 
         try:
             response = requests.get(radicale_base_url)
@@ -32,7 +33,7 @@ class TestCalendar(BaseTestCalendar):
             ok_(False, 'Unable to contact radicale on HTTP')
 
     def test_func__radicale_auth__ok__as_lawrence(self):
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
         client = caldav.DAVClient(
             radicale_base_url,
             username='lawrence-not-real-email@fsf.local',
@@ -45,7 +46,7 @@ class TestCalendar(BaseTestCalendar):
             ok_(False, 'AuthorizationError when communicate with radicale')
 
     def test_func__radicale_auth__fail__as_john_doe(self):
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
         client = caldav.DAVClient(
             radicale_base_url,
             username='john.doe@foo.local',
@@ -59,7 +60,7 @@ class TestCalendar(BaseTestCalendar):
             ok_(True, 'AuthorizationError thrown correctly')
 
     def test_func__rights_read_user_calendar__ok__as_lawrence(self):
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
         client = caldav.DAVClient(
             radicale_base_url,
             username='lawrence-not-real-email@fsf.local',
@@ -68,7 +69,7 @@ class TestCalendar(BaseTestCalendar):
         user = DBSession.query(User).filter(
             User.email == 'lawrence-not-real-email@fsf.local'
         ).one()
-        user_calendar_url = self._get_user_calendar_url(user.user_id)
+        user_calendar_url = CalendarManager.get_user_calendar_url(user.user_id)
         try:
             caldav.Calendar(
                 parent=client,
@@ -81,7 +82,7 @@ class TestCalendar(BaseTestCalendar):
             ok_(False, 'User should not access that')
 
     def test_func__rights_read_user_calendar__fail__as_john_doe(self):
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
         client = caldav.DAVClient(
             radicale_base_url,
             username='john.doe@foo.local',
@@ -90,7 +91,7 @@ class TestCalendar(BaseTestCalendar):
         other_user = DBSession.query(User).filter(
             User.email == 'admin@admin.admin'
         ).one()
-        user_calendar_url = self._get_user_calendar_url(other_user.user_id)
+        user_calendar_url = CalendarManager.get_user_calendar_url(other_user.user_id)
         try:
             caldav.Calendar(
                 parent=client,
@@ -113,13 +114,13 @@ class TestCalendar(BaseTestCalendar):
         workspace.calendar_enabled = True
         DBSession.flush()
 
-        workspace_calendar_url = self._get_workspace_calendar_url(
+        workspace_calendar_url = CalendarManager.get_workspace_calendar_url(
             workspace.workspace_id
         )
 
         transaction.commit()
 
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
         client = caldav.DAVClient(
             radicale_base_url,
             username='lawrence-not-real-email@fsf.local',
@@ -147,13 +148,13 @@ class TestCalendar(BaseTestCalendar):
         workspace.calendar_enabled = True
         DBSession.flush()
 
-        workspace_calendar_url = self._get_workspace_calendar_url(
+        workspace_calendar_url = CalendarManager.get_workspace_calendar_url(
             workspace.workspace_id
         )
 
         transaction.commit()
 
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
         client = caldav.DAVClient(
             radicale_base_url,
             username='bob@fsf.local',
@@ -174,13 +175,15 @@ class TestCalendar(BaseTestCalendar):
         lawrence = DBSession.query(User).filter(
             User.email == 'lawrence-not-real-email@fsf.local'
         ).one()
-        radicale_base_url = self._get_base_url()
+        radicale_base_url = CalendarManager.get_base_url()
         client = caldav.DAVClient(
             radicale_base_url,
             username='lawrence-not-real-email@fsf.local',
             password='foobarbaz'
         )
-        user_calendar_url = self._get_user_calendar_url(lawrence.user_id)
+        user_calendar_url = CalendarManager.get_user_calendar_url(
+            lawrence.user_id
+        )
         user_calendar = caldav.Calendar(
             parent=client,
             client=client,