ac0a6563f74c30f900fa8ea6caa4708b1807380f rhead Wed Oct 24 21:49:51 2012 -0700 Added an exception for an empty table list. Thanks, Pauline. diff --git src/utils/qa/qaGbTracks src/utils/qa/qaGbTracks index 839108a..e55b2bf 100755 --- src/utils/qa/qaGbTracks +++ src/utils/qa/qaGbTracks @@ -29,30 +29,36 @@ creates 2 files: outFile.summary, outFile.log """) parser.add_argument('db', help='the database to check') parser.add_argument('-f', dest='tableFile', nargs=1, type=argparse.FileType('r'), help='a file listing tables to check (separated by spaces or newlines)') parser.add_argument('table', help ='the name of a table to check', nargs='*') parser.add_argument('outFile', help='base name to give results files') args = parser.parse_args() if args.tableFile: # add any additional tables in the table file to the table list args.table.extend((args.tableFile[0].read()).split()) args.tableFile[0].close() return args +def checkTablesReceived(tableList, outFile): + """Raises an exception if the tableList is empty. (Necessary because both ways of specifying + tables are optional.)""" + if not tableList: + raise Exception("Received outFile name '" + outFile + "', but no tables were specified.") + def tableExists(db, table): """True if the table exists in the given database.""" sqlResult = qaUtils.callHgsql(db, "show tables like '" + table + "'") return sqlResult.strip() == table def checkTablesExist(db, tableList): """Raises an exception if any table in the tables list does not exist in the database.""" for name in tableList: if not tableExists(db, name): raise Exception("Table " + name + " in " + db + " does not exist") def runTests(db, tableList, reporter, sumTable): """Runs validate() and statistics() methods on each table. Writes log output.""" delimiterLine = "===============================================" reporter.writeTimestamp() @@ -62,27 +68,28 @@ reporter.writeLine(db + "." + table +":\n") table = factory.tableQaFactory(db, table, reporter, sumTable) table.validate() reporter.writeBlankLine() table.statistics() reporter.writeLine("Tests complete:") reporter.writeTimestamp() def writeSummaryFile(sumTable, sumFile): sumFile.write(sumTable.tabSeparated()) args = parseCommandLine() tableList = args.table db = args.db outFile = args.outFile +checkTablesReceived(tableList, outFile) checkTablesExist(db, tableList) logFile = open(outFile + ".log", "w") sumFile = open(outFile + ".summary", "w") reporter = reporter.Reporter(logFile) sumTable = summary.SumTable() runTests(db, tableList, reporter, sumTable) writeSummaryFile(sumTable, sumFile) logFile.close() sumFile.close()