Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Plugin fixtures #716

Merged
merged 22 commits into from
Oct 20, 2017
Merged

WIP: Plugin fixtures #716

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
20d9f38
wip: add test fixture builder
DropD Sep 17, 2017
60f8808
wip: add FixtureManager, no tests yet
DropD Sep 18, 2017
db81004
fix minor bugs
DropD Sep 18, 2017
3cbf5f4
fix pre-commit config and add check
DropD Sep 22, 2017
0c3f1e3
change name of cleanup function, add contextmanager
DropD Sep 22, 2017
40b27b0
updated docstrings with examples
DropD Sep 22, 2017
6856823
add copy_db to postgres
DropD Sep 25, 2017
f6b0ba7
add reset_db method
DropD Sep 26, 2017
ea4034f
make setup be truly noninteractive in non_interactive mode
DropD Oct 19, 2017
792dc03
begin adding tests for FixtureManager
DropD Oct 19, 2017
43e7a38
complete fixtures test case
DropD Oct 19, 2017
8521628
FixtureManager: restore internal AiiDA settings
DropD Oct 19, 2017
1809f37
move fixtures test out of main test suite
DropD Oct 19, 2017
12e6cb8
plugin-fixtures: get sqla backend to work
DropD Oct 19, 2017
4ec8615
enhance docstring for FixtureManager
DropD Oct 19, 2017
2097522
test the PluginTestCase
DropD Oct 20, 2017
fe57f0e
docs & actually run plugin test case test
DropD Oct 20, 2017
1908856
fix plugin test case test
DropD Oct 20, 2017
33f1c6b
plugin test case: fix sqla db cleaning
DropD Oct 20, 2017
46661fc
fixtures: bump max_connections for pgtest cluster
DropD Oct 20, 2017
93243ce
bump pgtest requirement to >= 1.1.0 (for max_connections)
DropD Oct 20, 2017
20a382d
simplify fixtures docstring
DropD Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion .travis-data/test_plugin_testcase.py
View file
Open in desktop
@@ -1,5 +1,11 @@
"""Test the plugin test case"""
"""
Test the plugin test case

This must be in a separate file because it would clash with other tests,
Since the dbenv gets loaded on the temporary profile.
"""
import os
import unittest

from aiida.utils.fixtures import PluginTestCase
from aiida.backends.profile import BACKEND_DJANGO, BACKEND_SQLA
Expand Down Expand Up @@ -29,3 +35,6 @@ def tearDown(self):
with self.assertRaises(Exception):
load_node(self.data_pk)


if __name__ == '__main__':
unittest.main()
10 changes: 8 additions & 2 deletions aiida/utils/fixtures.py
View file
Open in desktop
Expand Up @@ -3,9 +3,14 @@

Usage (unittest)::

import os

MyTestCase(aiida.utils.fixtures.PluginTestCase):

BACKEND = <load from env variable etc>
BACKEND = os.environ.get('TEST_BACKEND')
# load the backend to be tested from the environment variable
# proceed the test command with TEST_BACKEND='django' | 'sqlalchemy'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

simply prepend the test command by TEST_BACKEND='django' or TEST_BACKEND='sqlalchemy'

# or set the TEST_BACKEND in your CI configuration

def setUp(self):
# load my test data
Expand Down Expand Up @@ -38,6 +43,7 @@ def test_my_stuff(test_data):
import unittest
import tempfile
import shutil
import os
from os import path
from contextlib import contextmanager

Expand Down Expand Up @@ -421,7 +427,7 @@ class PluginTestCase(unittest.TestCase):
* set to use the temporary config folder
* create and configure a profile
"""
BACKEND = BACKEND_DJANGO
BACKEND = os.environ.get('TEST_BACKEND')

@classmethod
def setUpClass(cls):
Expand Down