Projet

Général

Profil

0001-set-TENANT_BASE-to-a-non-exisiting-path-22892.patch

Emmanuel Cazenave, 30 mars 2018 09:56

Télécharger (1,94 ko)

Voir les différences:

Subject: [PATCH] set TENANT_BASE to a non exisiting path (#22892)

 tests_authentic/conftest.py  | 2 +-
 tests_authentic/settings.py  | 5 +++++
 tests_passerelle/settings.py | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)
tests_authentic/conftest.py
8 8

  
9 9
@pytest.fixture
10 10
def tenant_base(request, settings):
11
    base = tempfile.mkdtemp('combo-tenant-base')
11
    base = tempfile.mkdtemp('authentic-tenant-base')
12 12
    settings.TENANT_BASE = base
13 13

  
14 14
    def fin():
tests_authentic/settings.py
12 12
with patch.object(builtin, 'file', mock_open(read_data='xxx')):
13 13
    execfile(os.environ['DEBIAN_CONFIG_COMMON'])
14 14

  
15
# Avoid conflic with real tenants
16
# that might exist in /var/lib/authentic2_multitenant/tenants
17
TENANT_BASE = '/that/path/does/not/exist'
18

  
19

  
15 20
# Add the XForwardedForMiddleware
16 21
MIDDLEWARE_CLASSES = ('authentic2.middleware.XForwardedForMiddleware',) + MIDDLEWARE_CLASSES
17 22

  
tests_passerelle/settings.py
14 14
with patch.object(builtin, 'file', mock_open(read_data='xxx')):
15 15
    execfile(os.environ['DEBIAN_CONFIG_COMMON'])
16 16

  
17
# Avoid conflic with real tenants
18
# that might exist in /var/lib/passerelle/tenants
19
TENANT_BASE = '/that/path/does/not/exist'
20

  
17 21
# suds logs are buggy
18 22
LOGGING['loggers']['suds'] = {
19 23
        'level': 'ERROR',
20
-