From 51e080ce7a6967bdb0caad6dfa83eba9b0695332 Mon Sep 17 00:00:00 2001
From: Radko Krkos <krkos@cesnet.cz>
Date: Tue, 28 Aug 2018 19:28:12 +0200
Subject: [PATCH] Server/Tests: Centralize Server instance creation
---
warden_server/test_warden_server.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/warden_server/test_warden_server.py b/warden_server/test_warden_server.py
index 4355407..346f7df 100755
--- a/warden_server/test_warden_server.py
+++ b/warden_server/test_warden_server.py
@@ -121,7 +121,6 @@ class Warden3ServerTest(unittest.TestCase):
"""High level Warden3 Server tests"""
config = {'log': {'level': 'debug'}, 'validator': {'type': 'NoValidator'}, 'auth': {'type': 'PlainAuthenticator'},
'db': {'user': USER, 'password': PASSWORD, 'dbname': DB}, 'handler': {'description': 'Warden Test Server'}}
- app = build_server(config)
getInfo_interface_tests_specific = [
("/getInfo", "403 I'm watching. Authenticate."),
@@ -139,6 +138,7 @@ class Warden3ServerTest(unittest.TestCase):
def setUpClass(cls):
"""Pre-test cleanup"""
cls.clean_lastid()
+ cls.app = build_server(cls.config)
@classmethod
def clean_lastid(cls):
@@ -243,14 +243,12 @@ class X509AuthenticatorTest(Warden3ServerTest):
"""Performs the basic test suite using the X509Authenticator"""
config = deepcopy(Warden3ServerTest.config)
config['auth']['type'] = 'X509Authenticator'
- app = build_server(config)
class X509NameAuthenticatorTest(Warden3ServerTest):
"""Performs the basic test suite using the X509NameAuthenticator"""
config = deepcopy(Warden3ServerTest.config)
config['auth']['type'] = 'X509NameAuthenticator'
- app = build_server(config)
getInfo_interface_tests_specific = [
("/getInfo", "200 OK"),
--
GitLab