fix alembic configuration

Signed-off-by: Wojciech Sadowy <wojciech.sadowy@freedomfi.com>
magma · Apr 29, 2022 · 1f07635 · 1f07635
1 parent f07646e
commit 1f07635
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/dp/cloud/python/magma/db_service/migrations/alembic.ini b/dp/cloud/python/magma/db_service/migrations/alembic.ini
@@ -39,8 +39,6 @@ prepend_sys_path = .
 # are written from script.py.mako
 # output_encoding = utf-8
 
-sqlalchemy.url = ''
-
 
 [post_write_hooks]
 # post_write_hooks defines scripts or Python functions that are run

diff --git a/dp/cloud/python/magma/db_service/migrations/env.py b/dp/cloud/python/magma/db_service/migrations/env.py
@@ -34,7 +34,7 @@
 # can be acquired:
 # ... etc.
 
-db_url = config.get_section("alembic")["sqlalchemy.url"]
+db_url = config.get_section("alembic").get("sqlalchemy.url")
 
 if not db_url:
     db_service_cfg = get_config()

diff --git a/dp/cloud/python/magma/db_service/tests/alembic_testcase.py b/dp/cloud/python/magma/db_service/tests/alembic_testcase.py
@@ -66,7 +66,7 @@ def close_session(self):
     def drop_all(self):
         self.metadata.drop_all()
 
-    def assert_tables_equal(self, tables=None):
+    def then_tables_are(self, tables=None):
         if tables is None:
             tables = []
         self.reflect_tables()

diff --git a/dp/cloud/python/magma/db_service/tests/unit/test_b0cad5321c88.py b/dp/cloud/python/magma/db_service/tests/unit/test_b0cad5321c88.py
@@ -25,7 +25,7 @@ def test_b0cad5321c88_upgrade(self):
         self.upgrade()
 
         # then
-        self.assert_tables_equal(self.tables)
+        self.then_tables_are(self.tables)
 
     def test_b0cad5321c88_downgrade(self):
         # given
@@ -35,4 +35,4 @@ def test_b0cad5321c88_downgrade(self):
         self.downgrade()
 
         # then
-        self.assert_tables_equal()
+        self.then_tables_are()