Changeset 82937 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Jan 31, 2020 12:08:59 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135935

Message:

TestManager/partial-db-dump.py: Python 3 fixes.

File:

• trunk/src/VBox/ValidationKit/testmanager/db/partial-db-dump.py (modified) (11 diffs)

trunk/src/VBox/ValidationKit/testmanager/db/partial-db-dump.py

@@ -122 +122 @@
     def _doCopyTo(self, sTable, oZipFile, oDb, sSql, aoArgs = None):
         """ Does one COPY TO job. """
-        print 'Dumping %s...' % (sTable,);
+        print('Dumping %s...' % (sTable,));
 
         if aoArgs is not None:
@@ -131 +131 @@
         cRows = oDb.getRowCount();
         oFile.close();
-        print '... %s rows.' % (cRows,);
+        print('... %s rows.' % (cRows,));
 
         oZipFile.write(self.oConfig.sTempFile, sTable);
@@ -152 +152 @@
         oDb.execute('SELECT CURRENT_TIMESTAMP - INTERVAL \'%s days\'' % (self.oConfig.cDays + 2,));
         tsEffectiveSafe = oDb.fetchOne()[0];
-        print 'Going back to:     %s (safe: %s)' % (tsEffective, tsEffectiveSafe);
+        print('Going back to:     %s (safe: %s)' % (tsEffective, tsEffectiveSafe));
 
         # We dump test boxes back to the safe timestamp because the test sets may
@@ -169 +169 @@
         if oDb.getRowCount() > 0:
             idFirstTestSet = oDb.fetchOne()[0];
-        print 'First test set ID: %s' % (idFirstTestSet,);
+        print('First test set ID: %s' % (idFirstTestSet,));
 
         oDb.execute('SELECT MAX(idTestSet) FROM TestSets WHERE tsCreated >= %s', (tsEffective, ));
@@ -175 +175 @@
         if oDb.getRowCount() > 0:
             idLastTestSet = oDb.fetchOne()[0];
-        print 'Last test set ID: %s' % (idLastTestSet,);
+        print('Last test set ID: %s' % (idLastTestSet,));
 
         oDb.execute('SELECT MAX(idTestResult) FROM TestResults WHERE tsCreated >= %s', (tsEffective, ));
@@ -181 +181 @@
         if oDb.getRowCount() > 0:
             idLastTestResult = oDb.fetchOne()[0];
-        print 'Last test result ID: %s' % (idLastTestResult,);
+        print('Last test result ID: %s' % (idLastTestResult,));
 
 
@@ -215 +215 @@
 
         oZipFile.close();
-        print "Done!";
+        print('Done!');
         return 0;
 
@@ -258 +258 @@
         oDb.execute('SET CONSTRAINTS ALL DEFERRED;');
 
-        print 'Checking if the database looks empty...\n'
+        print('Checking if the database looks empty...\n');
         for sTable in asTablesInLoadOrder + [ 'TestBoxStatuses', 'GlobalResourceStatuses' ]:
             oDb.execute('SELECT COUNT(*) FROM ' + sTable);
@@ -265 +265 @@
             if sTable in [ 'SchedGroups', 'TestBoxStrTab', 'TestResultStrTab', 'Users' ]:    cMaxRows =  1;
             if cRows > cMaxRows:
-                print 'error: Table %s has %u rows which is more than %u - refusing to delete and load.' \
-                    % (sTable, cRows, cMaxRows,);
-                print 'info:  Please drop and recreate the database before loading!'
+                print('error: Table %s has %u rows which is more than %u - refusing to delete and load.'
+                      % (sTable, cRows, cMaxRows,));
+                print('info:  Please drop and recreate the database before loading!')
                 return 1;
 
-        print 'Dropping default table content...\n'
+        print('Dropping default table content...\n');
         for sTable in [ 'SchedGroups', 'TestBoxStrTab', 'TestResultStrTab', 'Users']:
             oDb.execute('DELETE FROM ' + sTable);
@@ -277 +277 @@
 
         for sTable in asTablesInLoadOrder:
-            print 'Loading %s...' % (sTable,);
+            print('Loading %s...' % (sTable,));
             oFile = oZipFile.open(sTable);
             oDb.copyExpert('COPY ' + sTable + ' FROM STDIN WITH (FORMAT TEXT)', oFile);
             cRows = oDb.getRowCount();
-            print '... %s rows.' % (cRows,);
+            print('... %s rows.' % (cRows,));
 
         oDb.execute('ALTER TABLE TestSets ADD FOREIGN KEY (idTestResult) REFERENCES TestResults(idTestResult)');
@@ -316 +316 @@
             oDb.execute('SELECT MAX(%s) FROM %s' % (sCol, sTab,));
             idMax = oDb.fetchOne()[0];
-            print '%s: idMax=%s' % (sSeq, idMax);
+            print('%s: idMax=%s' % (sSeq, idMax));
             if idMax is not None:
                 oDb.execute('SELECT setval(\'%s\', %s)' % (sSeq, idMax));
 
         # Last step.
-        print 'Analyzing...'
+        print('Analyzing...');
         oDb.execute('ANALYZE');
         oDb.commit();
 
-        print 'Done!'
+        print('Done!');
         return 0;