From 9e4d564a33a880946e2fbc057c8592ce04b3b510 Mon Sep 17 00:00:00 2001
From: Max Erenberg <merenber@csclub.uwaterloo.ca>
Date: Wed, 4 Aug 2021 17:15:06 +0000
Subject: [PATCH] move INI file locations

---
 ceo_common/test/__init__.py                           | 0
 ceod/api/app_factory.py                               | 2 +-
 {ceo_common/test => tests_common}/ceod_dev.ini        | 0
 {ceo_common/test => tests_common}/ceod_test_local.ini | 2 +-
 tests_common/fixtures.py                              | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 ceo_common/test/__init__.py
 rename {ceo_common/test => tests_common}/ceod_dev.ini (100%)
 rename {ceo_common/test => tests_common}/ceod_test_local.ini (95%)

diff --git a/ceo_common/test/__init__.py b/ceo_common/test/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ceod/api/app_factory.py b/ceod/api/app_factory.py
index c94122a5f..37726f3df 100644
--- a/ceod/api/app_factory.py
+++ b/ceod/api/app_factory.py
@@ -19,7 +19,7 @@ def create_app(flask_config={}):
     app.config.from_mapping(flask_config)
 
     if app.config.get('ENV') == 'development' and 'CEOD_CONFIG' not in os.environ:
-        with importlib.resources.path('ceo_common.test', 'ceod_dev.ini') as p:
+        with importlib.resources.path('tests_common', 'ceod_dev.ini') as p:
             config_file = p.__fspath__()
     else:
         config_file = None
diff --git a/ceo_common/test/ceod_dev.ini b/tests_common/ceod_dev.ini
similarity index 100%
rename from ceo_common/test/ceod_dev.ini
rename to tests_common/ceod_dev.ini
diff --git a/ceo_common/test/ceod_test_local.ini b/tests_common/ceod_test_local.ini
similarity index 95%
rename from ceo_common/test/ceod_test_local.ini
rename to tests_common/ceod_test_local.ini
index ab1aef6da..58b594bef 100644
--- a/ceo_common/test/ceod_test_local.ini
+++ b/tests_common/ceod_test_local.ini
@@ -33,7 +33,7 @@ home = /tmp/test_users
 skel = /users/skel
 
 [mail]
-smtp_url = smtp://mail.csclub.internal
+smtp_url = smtp://localhost:8025
 smtp_starttls = false
 
 [mailman3]
diff --git a/tests_common/fixtures.py b/tests_common/fixtures.py
index 5b8d6552a..b3fc42ee0 100644
--- a/tests_common/fixtures.py
+++ b/tests_common/fixtures.py
@@ -16,7 +16,7 @@ from ceod.model import KerberosService, LDAPService, FileService, User, \
 
 @pytest.fixture(autouse=True, scope='session')
 def cfg():
-    with importlib.resources.path('ceo_common.test', 'ceod_test_local.ini') as p:
+    with importlib.resources.path('tests_common', 'ceod_test_local.ini') as p:
         config_file = p.__fspath__()
     _cfg = Config(config_file)
     component.provideUtility(_cfg, IConfig)