Use other mysql login in tools unittest

1200wd · Feb 6, 2024 · 556e97f · 556e97f
1 parent 1545324
commit 556e97f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/unittests-mysql.yaml b/.github/workflows/unittests-mysql.yaml
@@ -1,4 +1,4 @@
-name: Bitcoinlib Tests Ubuntu MySQL
+name: Bitcoinlib Tests Ubuntu - MySQL
 on: [push]
 
 jobs:

diff --git a/bitcoinlib/db_cache.py b/bitcoinlib/db_cache.py
@@ -90,7 +90,8 @@ def __init__(self, db_uri=None):
 
     def drop_db(self):
         self.session.commit()
-        self.session.close_all()
+        self.session.close()
+        session.close_all_sessions()
         Base.metadata.drop_all(self.engine)
 
 

diff --git a/tests/test_tools.py b/tests/test_tools.py
@@ -45,10 +45,7 @@ def database_init(dbname=DATABASE_NAME):
         con.close()
         return 'postgresql://postgres:postgres@localhost:5432/' + dbname
     elif os.getenv('UNITTEST_DATABASE') == 'mysql':
-        try:
-            con = mysql.connector.connect(user='root', host='localhost')
-        except mysql.connector.errors.ProgrammingError:
-            con = mysql.connector.connect(user='user', host='localhost', password='password')
+        con = mysql.connector.connect(user='user', host='localhost', password='password')
         cur = con.cursor()
         cur.execute("DROP DATABASE IF EXISTS {}".format(dbname))
         cur.execute("CREATE DATABASE {}".format(dbname))