Fixtures management

tracim/tracim/fixtures/__init__.py

@@ -0,0 +1,39 @@
+import transaction
+
+from tracim.model import DBSession
+
+
+class Fixture(object):
+
+    """ Fixture classes (list) required for this fixtures"""
+    require = NotImplemented
+
+    def __init__(self, session):
+        self._session = session
+
+    def insert(self):
+        raise NotImplementedError()
+
+
+class FixturesLoader(object):
+    """
+    Fixtures loader. Load each fixture once.
+    """
+
+    def __init__(self, loaded=None):
+        loaded = [] if loaded is None else loaded
+        self._loaded = loaded
+
+    def loads(self, fixtures_classes):
+        for fixture_class in fixtures_classes:
+            for required_fixture_class in fixture_class.require:
+                self._load(required_fixture_class)
+            self._load(fixture_class)
+
+    def _load(self, fixture_class):
+        if fixture_class not in self._loaded:
+            fixture = fixture_class(DBSession)
+            fixture.insert()
+            self._loaded.append(fixture_class)
+            DBSession.flush()
+            transaction.commit()

tracim/tracim/fixtures/users_and_groups.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+from tracim import model
+from tracim.fixtures import Fixture
+
+
+class Base(Fixture):
+    require = []
+
+    def insert(self):
+        u = model.User()
+        u.display_name = 'Global manager'
+        u.email = 'admin@admin.admin'
+        u.password = 'admin@admin.admin'
+        self._session.add(u)
+
+        g1 = model.Group()
+        g1.group_id = 1
+        g1.group_name = 'users'
+        g1.display_name = 'Users'
+        g1.users.append(u)
+        self._session.add(g1)
+
+        g2 = model.Group()
+        g2.group_id = 2
+        g2.group_name = 'managers'
+        g2.display_name = 'Global Managers'
+        g2.users.append(u)
+        self._session.add(g2)
+
+        g3 = model.Group()
+        g3.group_id = 3
+        g3.group_name = 'administrators'
+        g3.display_name = 'Administrators'
+        g3.users.append(u)
+        self._session.add(g3)
+
+
+class Test(Fixture):
+    require = [Base, ]
+
+    def insert(self):
+        g2 = self._session.query(model.Group).filter(model.Group.group_name == 'managers').one()
+
+        lawrence = model.User()
+        lawrence.display_name = 'Lawrence L.'
+        lawrence.email = 'lawrence-not-real-email@fsf.org'
+        lawrence.password = 'foobarbaz'
+        self._session.add(lawrence)
+        g2.users.append(lawrence)

tracim/tracim/tests/__init__.py

@@ -25,7 +25,8 @@ from tg.util import Bunch
 from webtest import TestApp as BaseTestApp, AppError
 from who_ldap import make_connection
 
-from tracim.command import BaseCommand
+from tracim.fixtures import FixturesLoader
+from tracim.fixtures.users_and_groups import Base as BaseFixture
 from tracim.lib.base import logger
 from tracim.model import DBSession
 
@@ -149,6 +150,7 @@ def teardown_db():
 class TestStandard(object):
 
     application_under_test = application_name
+    fixtures = [BaseFixture, ]
 
     def setUp(self):
         self.app = load_app(self.application_under_test)
@@ -168,6 +170,11 @@ class TestStandard(object):
         setup_db()
         logger.debug(self, 'Start Database Setup... -> done')
 
+        logger.debug(self, 'Load extra fixtures...')
+        fixtures_loader = FixturesLoader([BaseFixture])  # BaseFixture is already loaded in bootstrap
+        fixtures_loader.loads(self.fixtures)
+        logger.debug(self, 'Load extra fixtures... -> done')
+
         self.app.get('/_test_vars')  # Allow to create fake context
         tg.i18n.set_lang('en')  # Set a default lang
 
@@ -207,6 +214,7 @@ class TestController(object):
     """
 
     application_under_test = application_name
+    fixtures = [BaseFixture, ]
 
     def setUp(self):
         """Setup test fixture for each functional test method."""
@@ -220,6 +228,9 @@ class TestController(object):
         setup_app(section_name=self.application_under_test)
         setup_db()
 
+        fixtures_loader = FixturesLoader([BaseFixture])  # BaseFixture is already loaded in bootstrap
+        fixtures_loader.loads(self.fixtures)
+
 
     def tearDown(self):
         """Tear down test fixture for each functional test method."""

tracim/tracim/tests/functional/test_ldap_authentication.py

@@ -5,6 +5,7 @@ Integration tests for the ldap authentication sub-system.
 from tracim.fixtures.ldap import ldap_test_server_fixtures
 from nose.tools import eq_, ok_
 
+from tracim.fixtures.users_and_groups import Test as TestFixture
 from tracim.model import DBSession, User
 from tracim.tests import LDAPTest, TracimTestController
 
@@ -12,6 +13,7 @@ from tracim.tests import LDAPTest, TracimTestController
 class TestAuthentication(LDAPTest, TracimTestController):
     application_under_test = 'ldap'
     ldap_server_data = ldap_test_server_fixtures
+    fixtures = [TestFixture, ]
 
     def test_ldap_auth_fail_no_account(self):
         # User is unknown in tracim database

tracim/tracim/tests/functional/test_ldap_restrictions.py

@@ -5,6 +5,7 @@ from bs4 import BeautifulSoup
 from nose.tools import eq_, ok_
 
 from tracim.fixtures.ldap import ldap_test_server_fixtures
+from tracim.fixtures.users_and_groups import Test as TestFixture
 from tracim.lib.base import current_user
 from tracim.model import DBSession, User
 from tracim.tests import LDAPTest, TracimTestController
@@ -13,6 +14,7 @@ from tracim.tests import LDAPTest, TracimTestController
 class TestAuthentication(LDAPTest, TracimTestController):
     application_under_test = 'ldap'
     ldap_server_data = ldap_test_server_fixtures
+    fixtures = [TestFixture, ]
 
     def test_password_disabled(self):
         """

tracim/tracim/tests/library/test_ldap_without_ldap_groups.py

@@ -3,6 +3,7 @@ from nose.tools import eq_
 from tg import config
 
 from tracim.fixtures.ldap import ldap_test_server_fixtures
+from tracim.fixtures.users_and_groups import Test as TestFixtures
 from tracim.lib.auth.ldap import LDAPAuth
 from tracim.lib.helpers import ini_conf_to_bool
 from tracim.model import DBSession, User, Group
@@ -15,6 +16,7 @@ class TestContentApi(LDAPTest, TestStandard):
     """
     application_under_test = 'ldap'
     ldap_server_data = ldap_test_server_fixtures
+    fixtures = [TestFixtures]
 
     def _check_db_user(self, email, count=1):
         eq_(count, DBSession.query(User).filter(User.email == email).count())

tracim/tracim/websetup/bootstrap.py

@@ -2,57 +2,20 @@
 """Setup the tracim application"""
 from __future__ import print_function
 
-import logging
-from tg import config
-from tracim import model
 import transaction
 
+from tracim.fixtures import FixturesLoader
+from tracim.fixtures.users_and_groups import Base as BaseFixture
+
+
 def bootstrap(command, conf, vars):
     """Place any commands to setup tracim here"""
 
     # <websetup.bootstrap.before.auth
     from sqlalchemy.exc import IntegrityError
     try:
-        u = model.User()
-        u.display_name = 'Global manager'
-        u.email = 'admin@admin.admin'
-        u.password = 'admin@admin.admin'
-        model.DBSession.add(u)
-
-        g1 = model.Group()
-        g1.group_id = 1
-        g1.group_name = 'users'
-        g1.display_name = 'Users'
-        g1.users.append(u)
-        model.DBSession.add(g1)
-
-        g2 = model.Group()
-        g2.group_id = 2
-        g2.group_name = 'managers'
-        g2.display_name = 'Global Managers'
-        g2.users.append(u)
-        model.DBSession.add(g2)
-
-        g3 = model.Group()
-        g3.group_id = 3
-        g3.group_name = 'administrators'
-        g3.display_name = 'Administrators'
-        g3.users.append(u)
-        model.DBSession.add(g3)
-
-        # TODO: - B.S. - 20160212: Following fixture is LDAP tests specific, should make an little fixture management
-        # for tests
-        lawrence = model.User()
-        lawrence.display_name = 'Lawrence L.'
-        lawrence.email = 'lawrence-not-real-email@fsf.org'
-        lawrence.password = 'foobarbaz'
-        model.DBSession.add(lawrence)
-        g2.users.append(lawrence)
-
-        model.DBSession.flush()
-        transaction.commit()
-        pass
-
+        fixtures_loader = FixturesLoader()
+        fixtures_loader.loads([BaseFixture])
     except IntegrityError:
         print('Warning, there was a problem adding your auth data, it may have already been added:')
         import traceback