Merge branch 'master' into dbtests

[dak.git] / tests / db_test.py

diff --git a/tests/db_test.py b/tests/db_test.py
index e9a533650df2e910ec4584b6990fca6d9158119e..7e013c2421e4ed696b6289cc785fcb722529f6a8 100644 (file)
--- a/tests/db_test.py
+++ b/tests/db_test.py
@@ -3,7 +3,7 @@ from base_test import DakTestCase, fixture
 from daklib.config import Config
 from daklib.dbconn import DBConn
 
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, __version__
 from sqlalchemy.exc import SADeprecationWarning
 
 import pickle
@@ -29,7 +29,8 @@ class DBDakTestCase(DakTestCase):
             if cnf["DB::Port"] and cnf["DB::Port"] != "-1":
                 connstr += "?port=%s" % cnf["DB::Port"]
 
-        pickle_file = open(fixture('db-metadata.pkl'), 'r')
+        pickle_filename = 'db-metadata-%s.pkl' % __version__
+        pickle_file = open(fixture(pickle_filename), 'r')
         self.metadata = pickle.load(pickle_file)
         self.metadata.ddl_listeners = pickle.load(pickle_file)
         pickle_file.close()