done changes test vesrions

Author: cis-muzahid

src/class_sqlThread.py

@@ -101,17 +101,17 @@ def upgrade_to_latest(self, max_level=None):
         """
             Initialise upgrade level
         """
-        print("===========", max_level)
-        query = "SELECT value FROM settings WHERE key='version'"
-        parameters = ()
-        self.cur.execute(query, parameters)
-        print("currnt version", int(self.cur.fetchall()[0][0]))
+        # print("===========", max_level)
+        # query = "SELECT value FROM settings WHERE key='version'"
+        # parameters = ()
+        # self.cur.execute(query, parameters)
+        # print("currnt version", int(self.cur.fetchall()[0][0]))
 
         while self.sql_schema_version < max_level if max_level is not None else self.max_level:
             self._upgrade_one_level_sql_statement(self.sql_schema_version)
             self.sql_schema_version = True
-            print("max level is", max_level)
-            print("current updated version is", self.sql_schema_version)
+            # print("max level is", max_level)
+            # print("current updated version is", self.sql_schema_version)
 
     def upgrade_schema_if_old_version(self):
         """ check settings table exists """

src/tests/sql/init_version_10.sql

@@ -1 +1 @@
-INSERT INTO addressbook SELECT label, address;
+INSERT INTO `addressbook` VALUES ('test', "BM-2cWzMnxjJ7yRP3nLEWUV5LisTZyREWSxYz"), ('testone', "BM-2cWzMnxjJ7yRP3nLEWUV5LisTZyREWSxYz");

src/tests/sql/init_version_2.sql

@@ -1 +1 @@
-INSERT INTO `inventory` VALUES ('hash', 1, 1,1, 1,'test');
+INSERT INTO `inventory` VALUES ('hash', 1, 1,1, 1,'test');

src/tests/sql/init_version_4.sql

@@ -1 +1,2 @@
 INSERT INTO `pubkeys` VALUES ('hash', 1, 1, 1,'test');
+

src/tests/sql/init_version_5.sql

@@ -1 +1,2 @@
 INSERT INTO `objectprocessorqueue` VALUES ('hash', 1);
+

src/tests/sql/init_version_6.sql

@@ -1 +1,2 @@
 INSERT INTO `inventory` VALUES ('hash', 1, 1, 1,'test','test');
+

src/tests/test_sqlthread.py

@@ -89,7 +89,7 @@ def wrapper(*args):
             self = args[0]
             func_name = func.__name__
             version = func_name.rsplit('_', 1)[-1]
-            print("-=-=-=-=-=-=-", version)
+            # print("-=-=-=-=-=-=-", version)
 
             # Test versions
             # self.test_db._upgrade_one_level_sql_statement(int(version))   # pylint: disable= W0212, protected-access
@@ -216,11 +216,7 @@ def test_bm_db_version_10(self):
             Test with version 10
         """
 
-        self.test_db.cur.execute(''' SELECT count(name) FROM sqlite_master WHERE type='table' AND name='old_addressbook' ''')  # noqa
+        label = "test"
+        self.test_db.cur.execute("SELECT * FROM addressbook WHERE label='test' ")  # noqa
         res = self.test_db.cur.fetchall()
-        self.assertNotEqual(res[0][0], 1, "Table old_addressbook not deleted")
-        self.assertEqual(len(res), 1, "Table old_addressbook not deleted")
-        self.test_db.cur.execute('''PRAGMA table_info('addressbook');''')
-        res = self.test_db.cur.fetchall()
-        result = list(filter_table_column(res, "address"))
-        self.assertEqual(result, ['address'], "Data not migrated for version 10")
+        self.assertEqual(res[0][0], label, "Data not migrated for version 10")