Optimize unit tests - don't drop db betewen tests

Author: vmalloc

flask_app/auth.py

@@ -28,7 +28,7 @@ def testing_login():
 
     testing_email = 'testing@localhost'
 
-    user = user_datastore.get_user(testing_email)
+    user = _get_or_create_user({'email': testing_email})
     assert user
     login_user(user)
     user_info = {}

flask_app/blueprints/rest.py

@@ -27,14 +27,14 @@ def decorator(resource):
 class SessionResource(ModelResource):
 
     MODEL = Session
-    DEFAULT_SORT = ((Session.end_time == None).desc(), Session.end_time.desc())
+    DEFAULT_SORT = (Session.start_time.desc(),)
 
 
 @_resource('/tests', '/tests/<int:object_id>', '/sessions/<int:session_id>/tests')
 class TestResource(ModelResource):
 
     MODEL = Test
-    DEFAULT_SORT = ((Test.end_time == None).desc(), Test.end_time.desc())
+    DEFAULT_SORT = (Test.start_time.desc(),)
 
     def _get_iterator(self):
         session_id = request.args.get('session_id')

pytest.ini

@@ -1,2 +1 @@
 [pytest]
-addopts = tests

tests/conftest.py

@@ -16,6 +16,18 @@
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 
+@pytest.fixture(scope='session', autouse=True)
+def patch_proxy_bypass():
+    """Work around a bug causing should_bypass_proxies to take forever when VPN is active
+    """
+    import requests
+    requests.utils.should_bypass_proxies = lambda url: True
+
+@pytest.fixture(scope='session', autouse=True)
+def invalidate_cache():
+    cache.invalidate()
+
+
 def pytest_addoption(parser):
     parser.addoption("--url", action="store", default=None)
 
@@ -50,35 +62,43 @@ def webapp_without_login(request):
     return _create_webapp(request)
 
 
+_cached_app = None
+_cached_config = None
+
+def _create_flask_app():
+    global _cached_app
+    global _cached_config
+
+    if _cached_app is None:
+
+        returned = _cached_app = app.create_app({
+            #'SQLALCHEMY_DATABASE_URI': 'postgresql://127.0.0.1/backslash-ut',
+            'SECRET_KEY': 'testing-key',
+            'TESTING': True,
+            'SECURITY_PASSWORD_SALT': 'testing_salt',
+            'JSONIFY_PRETTYPRINT_REGULAR': False,
+            'JSON_SORT_KEYS': False,
+        })
+        _cached_config = returned.config.copy()
+        returned.extensions['security'].password_salt = returned.config[
+            'SECURITY_PASSWORD_SALT']
+
+    else:
+        returned = _cached_app
+        returned.config.update(_cached_config.copy())
+    return returned
+
+
 def _create_webapp(request):
-    returned = Webapp(app.create_app({
-        'SQLALCHEMY_DATABASE_URI': 'postgresql://127.0.0.1/backslash-ut',
-        'SECRET_KEY': 'testing-key',
-        'TESTING': True,
-        'SECURITY_PASSWORD_SALT': 'testing_salt',
-    }))
+    returned = Webapp(_create_flask_app())
     returned.activate()
     request.addfinalizer(returned.deactivate)
-    returned.app.extensions['security'].password_salt = returned.app.config[
-        'SECURITY_PASSWORD_SALT']
     return returned
 
-
-@pytest.fixture(scope='function', autouse=True)
-def db(request, webapp_without_login):
-    global _test_index
-    with webapp_without_login.app.app_context():
-        models.db.session.close()
-        models.db.drop_all()
-        models.db.create_all()
+@pytest.fixture
+def db():
     return models.db
 
-
-@pytest.fixture(scope='function', autouse=True)
-def invalidate_cache():
-    cache.invalidate()
-
-
 @pytest.fixture
 def runtoken(db, webapp_without_login, testuser):
     with webapp_without_login.app.app_context():
@@ -88,19 +108,27 @@ def runtoken(db, webapp_without_login, testuser):
         db.session.commit()
     return token_string
 
+@pytest.fixture
+def testuser(testuser_and_id):
+    return testuser_and_id[0]
+
+@pytest.fixture
+def testuser_id(testuser_and_id):
+    return testuser_and_id[1]
 
 @pytest.fixture
-def testuser(db, webapp_without_login, testuser_email):
+def testuser_and_id(db, webapp_without_login, testuser_email):
     with webapp_without_login.app.app_context():
         user = models.User(email=testuser_email, active=True)
         db.session.add(user)
         db.session.commit()
-    return user
+        user_id = user.id
+    return user, user_id
 
 
 @pytest.fixture
 def testuser_email():
-    return 'testing@localhost'
+    return 'testing{}@localhost'.format(uuid4())
 
 
 @pytest.fixture
@@ -182,3 +210,8 @@ def raw_method(self, *args, **kwargs):
 
 for _method in ("get", "put", "post", "delete"):
     _make_request_shortcut(_method)
+
+
+@pytest.fixture
+def flask_app(webapp):
+    return webapp.app

tests/test_ut/conftest.py

@@ -1,5 +1,5 @@
 import math
-from uuid import uuid1
+from uuid import uuid4
 
 import flux
 from munch import Munch
@@ -9,7 +9,7 @@
 
 @pytest.fixture
 def subjects():
-    return [
+    returned = [
         Munch(name='prod1', product='Car',
               version=None, revision='120'),
         Munch(name='prod2', product='Car',
@@ -19,6 +19,12 @@ def subjects():
         Munch(name='prod4', product='Car',
               version=None, revision='120'),
     ]
+    salt = '_{}'.format(uuid4())
+
+    for subj in returned:
+        subj.name += salt
+        subj.product += salt
+    return returned
 
 
 @pytest.fixture(autouse=True, scope='session')
@@ -35,6 +41,10 @@ def finalizer():
     next_round_time = math.ceil(current_time * 10000) / 10000.0
     flux.current_timeline.sleep(next_round_time - current_time)
 
+@pytest.fixture(autouse=True, scope='function')
+def advance_timeline():
+    flux.current_timeline.sleep(10)
+
 
 @pytest.fixture
 def started_session(client):
@@ -127,7 +137,3 @@ def metadata_holder(request, client, test_info):
     test = session.report_test_start(**test_info)
     return test
 
-
-@pytest.fixture
-def flask_app(webapp):
-    return webapp.app

tests/test_ut/test_session_api.py

@@ -1,10 +1,11 @@
+import itertools
 import socket
 
 import flux
-
 import pytest
+from flask_app.models import User
 
-from .utils import raises_not_found, raises_conflict, raises_bad_request
+from .utils import raises_bad_request, raises_conflict, raises_not_found
 
 
 def test_start_session(client):
@@ -37,25 +38,15 @@ def test_started_session_hostname_specify_explicitly(client):
     assert session.hostname == hostname
 
 
-def test_session_user(started_session):
-    assert started_session.user_id == 1
-
+def test_session_user(started_session, testuser_id):
+    assert started_session.user_id == testuser_id
 
 
 def test_started_session_times(started_session):
     assert started_session.start_time is not None
     assert started_session.end_time is None
 
 
-def test_query_all_sessions(client, started_session):
-    [session] = client.query_sessions()
-    assert session.id == started_session.id
-
-def test_query_all_tests(client, started_test):
-    [test] = client.query_tests()
-    assert test.id == started_test.id
-    assert test == started_test
-
 
 @pytest.mark.parametrize('use_duration', [True, False])
 def test_end_session(started_session, use_duration):
@@ -123,4 +114,3 @@ def test_session_query_tests(started_session_with_ended_test):
     assert queried_test.id == test.id
     test.refresh()  # need to update end_time
     assert queried_test == test
-