Fixed bug in table count check, and added in encryption test check (#13)

Author: saikumar-vs

suite/ssl/encryption_qa.py

@@ -127,6 +127,14 @@ def encryption_qa(self):
                     print(data_load_query)
                 result = os.system(data_load_query)
                 utility_cmd.check_testcase(result, "Sample data load")
+
+            # Checksum for tables in test DB for 8.0.
+            version = utility_cmd.version_check(BASEDIR)
+            if int(version) >= int("080000"):
+                result = utility_cmd.check_table_count(BASEDIR, 'test', WORKDIR + '/node1/mysql.sock',
+                                                                    WORKDIR + '/node2/mysql.sock')
+                utility_cmd.check_testcase(result, "Checksum run for DB: test")
+
             utility_cmd.stop_pxc(WORKDIR, BASEDIR, NODE)
 
 

util/utility.py

@@ -70,8 +70,9 @@ def check_table_count(self, basedir, db, socket1, socket2):
         query = basedir + '/bin/mysql -uroot ' + db + ' --socket=' + \
                 socket1 + ' -Bse"show tables;"'
         tables = os.popen(query).read().rstrip()
+        tables_names = tables.split('\n')
         # Compare the table checksum between node1 and node2
-        for table in tables.split('\n'):
+        for index, table in enumerate(tables_names):
             query = basedir + '/bin/mysql -uroot --socket=' + \
                     socket1 + ' -Bse"checksum table ' + \
                     db + '.' + table + ';"'
@@ -87,7 +88,12 @@ def check_table_count(self, basedir, db, socket1, socket2):
                 print(query)
                 print('Table count ' + table_count_node2)
             if table_count_node1 == table_count_node2:
-                return 0
+                # Using Mod, get index of element and check if we reached to the end
+                # of list, if so return otherwise continue checking other tables.
+                next_index = (index + 1) % len(tables_names)
+                if next_index == 0:
+                    return 0
+                else: continue
             else:
                 print("\tTable(" + db + '.' + table + " ) checksum is different")
                 return 1