From 6030cb63150bb7b639c96ed00523808dc6a184f4 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Thu, 10 Jan 2019 09:50:05 +0100
Subject: [PATCH] Use pytest's conftest from swh-scheduler

---
 swh/lister/core/tests/conftest.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/swh/lister/core/tests/conftest.py b/swh/lister/core/tests/conftest.py
index 89e28a6..bdbfa02 100644
--- a/swh/lister/core/tests/conftest.py
+++ b/swh/lister/core/tests/conftest.py
@@ -1,9 +1,5 @@
 import pytest
-
-
-@pytest.fixture(scope='session')
-def celery_enable_logging():
-    return True
+from swh.scheduler.tests.conftest import *  # noqa
 
 
 @pytest.fixture(scope='session')
@@ -16,13 +12,3 @@ def celery_includes():
         'swh.lister.npm.tasks',
         'swh.lister.pypi.tasks',
     ]
-
-
-# override the celery_session_app fixture to monkeypatch the 'main'
-# swh.scheduler.celery_backend.config.app Celery application
-# with the test application.
-@pytest.fixture(scope='session')
-def swh_app(celery_session_app):
-    import swh.scheduler.celery_backend.config
-    swh.scheduler.celery_backend.config.app = celery_session_app
-    yield celery_session_app