Radicale: test required code

tracim/test.ini

@@ -36,4 +36,11 @@ ldap_tls = False
 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
+radicale.server.port = 15232
+radicale.client.port = 15232
+use = config:development.ini
+
 # Add additional test specific configuration options as necessary.

tracim/tracim/config/app_cfg.py

@@ -217,7 +217,9 @@ class CFG(object):
         ]
 
         self.RADICALE_SERVER_HOST = tg.config.get('radicale.server.host', '0.0.0.0')
-        self.RADICALE_SERVER_PORT = tg.config.get('radicale.server.port', 5232)
+        self.RADICALE_SERVER_PORT = int(
+            tg.config.get('radicale.server.port', 5232)
+        )
         # Note: Other parameters needed to work in SSL (cert file, etc)
         self.RADICALE_SERVER_SSL = asbool(tg.config.get('radicale.server.ssl', False))
         self.RADICALE_SERVER_FILE_SYSTEM_FOLDER = tg.config.get(

tracim/tracim/lib/calendar.py

@@ -24,10 +24,11 @@ CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+).ics'
 CALENDAR_TYPE_USER = UserCalendar
 CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar
 
+CALENDAR_BASE_URL = '{proto}://{domain}:{port}'
 CALENDAR_USER_URL_TEMPLATE = \
-    '{proto}://{domain}:{port}/user/{id}.ics#{slug}'
+    CALENDAR_BASE_URL + '/user/{id}.ics#{slug}'
 CALENDAR_WORKSPACE_URL_TEMPLATE = \
-    '{proto}://{domain}:{port}/workspace/{id}.ics#{slug}'
+    CALENDAR_BASE_URL + '/workspace/{id}.ics#{slug}'
 
 
 class CalendarManager(object):

tracim/tracim/lib/daemons.py

@@ -1,14 +1,13 @@
 import threading
 from wsgiref.simple_server import make_server
-
 import signal
+import transaction
 
 from radicale import Application as RadicaleApplication
-from radicale import HTTPServer as RadicaleHTTPServer
-from radicale import HTTPSServer as RadicaleHTTPSServer
+from radicale import HTTPServer as BaseRadicaleHTTPServer
+from radicale import HTTPSServer as BaseRadicaleHTTPSServer
 from radicale import RequestHandler as RadicaleRequestHandler
 from radicale import config as radicale_config
-from tg import TGApp
 
 from tracim.lib.base import logger
 from tracim.lib.exceptions import AlreadyRunningDaemon
@@ -74,6 +73,24 @@ class DaemonsManager(object):
         self._running_daemons = {}
 
 
+class TracimSocketServerMixin(object):
+    """
+    Mixin to use with socketserver.BaseServer who add _after_serve_actions
+    method executed after end of server execution.
+    """
+    def serve_forever(self, *args, **kwargs):
+        super().serve_forever(*args, **kwargs)
+        # After serving (in case of stop) do following:
+        self._after_serve_actions()
+
+    def _after_serve_actions(self):
+        """
+        Override (and call super if needed) to execute actions when server
+        finish it's job.
+        """
+        transaction.commit()
+
+
 class Daemon(threading.Thread):
     """
     Thread who contains daemon. You must implement start and stop methods to
@@ -86,6 +103,14 @@ class Daemon(threading.Thread):
         raise NotImplementedError()
 
 
+class RadicaleHTTPSServer(TracimSocketServerMixin, BaseRadicaleHTTPSServer):
+    pass
+
+
+class RadicaleHTTPServer(TracimSocketServerMixin, BaseRadicaleHTTPServer):
+    pass
+
+
 class RadicaleDaemon(Daemon):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

tracim/tracim/tests/__init__.py

@@ -28,6 +28,7 @@ from who_ldap import make_connection
 
 from tracim.fixtures import FixturesLoader
 from tracim.fixtures.users_and_groups import Base as BaseFixture
+from tracim.config.app_cfg import daemons
 from tracim.lib.base import logger
 from tracim.lib.content import ContentApi
 from tracim.lib.workspace import WorkspaceApi
@@ -239,6 +240,7 @@ class TestController(object):
     def tearDown(self):
         """Tear down test fixture for each functional test method."""
         DBSession.close()
+        daemons.stop_all()
         teardown_db()
 
 
@@ -344,3 +346,21 @@ class BaseTestThread(BaseTest):
                                                parent=folder,
                                                owner=user)
         return thread
+
+
+class TestCalendar(TestController):
+    application_under_test = 'radicale'
+
+    def setUp(self):
+        super().setUp()
+        self._clear_radicale_fs()
+
+    @staticmethod
+    def _clear_radicale_fs():
+        radicale_fs_path = config.radicale.server.filesystem.folder
+        try:
+            files = os.listdir(radicale_fs_path)
+            for file in files:
+                os.remove('{0}/{1}'.format(radicale_fs_path, file))
+        except FileNotFoundError:
+            pass  # Dir not exists yet, no need to clear it

tracim/tracim/tests/functional/test_calendar.py

@@ -0,0 +1,27 @@
+import time
+
+from nose.tools import eq_, ok_
+import requests
+from requests.exceptions import ConnectionError
+
+from tracim.lib.calendar import CALENDAR_BASE_URL
+from tracim.tests import TestCalendar as BaseTestCalendar
+
+
+class TestCalendar(BaseTestCalendar):
+    def test_unit__radicale_connectivity__ok__nominal_case(self):
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+
+        radicale_base_url = CALENDAR_BASE_URL.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)
+        )
+        try:
+            time.sleep(2)  # TODO - 20160606 - Bastien: sleep to wait ...
+            # ... radicale daemon started. We should lock something somewhere !
+            response = requests.get(radicale_base_url)
+            eq_(response.status_code, 401, 'Radicale http response is 401')
+        except ConnectionError:
+            ok_(False, 'Unable to contact radicale on HTTP')