From a0cc76259e38525f867c4ac04b52993802116e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 31 Aug 2016 11:29:16 +0200 Subject: [PATCH] Renamed TestPillarServer to PillarTestServer TestXXX classes are seen as unit tests by py.test, so anything that's not a unit test should not be called TestXXX. --- pillar/tests/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pillar/tests/__init__.py b/pillar/tests/__init__.py index aa5134e3..0e74cb14 100644 --- a/pillar/tests/__init__.py +++ b/pillar/tests/__init__.py @@ -52,9 +52,9 @@ BLENDER_ID_USER_RESPONSE = {'status': 'success', 'token_expires': 'Mon, 1 Jan 2018 01:02:03 GMT'} -class TestPillarServer(pillar.PillarServer): +class PillarTestServer(pillar.PillarServer): def _load_flask_config(self): - super(TestPillarServer, self)._load_flask_config() + super(PillarTestServer, self)._load_flask_config() pillar_config_file = os.path.join(MY_PATH, 'config_testing.py') self.config.from_pyfile(pillar_config_file) @@ -70,7 +70,7 @@ class TestPillarServer(pillar.PillarServer): class AbstractPillarTest(TestMinimal): - pillar_server_class = TestPillarServer + pillar_server_class = PillarTestServer def setUp(self, **kwargs): eve_settings_file = os.path.join(MY_PATH, 'eve_test_settings.py')