diff --git a/lnt/lnttool/main.py b/lnt/lnttool/main.py --- a/lnt/lnttool/main.py +++ b/lnt/lnttool/main.py @@ -10,6 +10,7 @@ from .viewcomparison import action_view_comparison from .admin import group_admin from lnt.util import logger +from lnt.server.db.rules_manager import register_hooks import click import logging import sys @@ -183,14 +184,20 @@ @submit_options @click.option("--verbose", "-v", is_flag=True, help="show verbose test results") -def action_submit(url, files, select_machine, merge, verbose): +@click.option("--testsuite", "-s", default='nts', show_default=True, + help="testsuite to use in case of url is a path to instance") +def action_submit(url, files, select_machine, merge, verbose, testsuite): """submit a test report to the server""" from lnt.util import ServerUtil import lnt.util.ImportData + if '://' not in url: + init_logger(logging.DEBUG) + register_hooks() + results = ServerUtil.submitFiles(url, files, verbose, select_machine=select_machine, - merge_run=merge) + merge_run=merge, testsuite=testsuite) for submitted_file in results: if verbose: lnt.util.ImportData.print_report_result( diff --git a/lnt/server/db/rules/rule_update_fixed_regressions.py b/lnt/server/db/rules/rule_update_fixed_regressions.py --- a/lnt/server/db/rules/rule_update_fixed_regressions.py +++ b/lnt/server/db/rules/rule_update_fixed_regressions.py @@ -116,21 +116,21 @@ for regression in detects: if impacts(session, ts, run_id, regression) and is_fixed(session, ts, regression): - logger.info("Detected fixed regression" + str(regression)) + logger.info("Detected fixed regression " + str(regression)) regression.state = RegressionState.IGNORED regression.title = regression.title + " [Detected Fixed]" changed += 1 for regression in staged: if impacts(session, ts, run_id, regression) and is_fixed(session, ts, regression): - logger.info("Staged fixed regression" + str(regression)) + logger.info("Staged fixed regression " + str(regression)) regression.state = RegressionState.DETECTED_FIXED regression.title = regression.title + " [Detected Fixed]" changed += 1 for regression in active: if impacts(session, ts, run_id, regression) and is_fixed(session, ts, regression): - logger.info("Active fixed regression" + str(regression)) + logger.info("Active fixed regression " + str(regression)) regression.state = RegressionState.DETECTED_FIXED regression.title = regression.title + " [Detected Fixed]" changed += 1 diff --git a/lnt/util/ServerUtil.py b/lnt/util/ServerUtil.py --- a/lnt/util/ServerUtil.py +++ b/lnt/util/ServerUtil.py @@ -69,7 +69,8 @@ return -def submitFileToInstance(path, file, select_machine=None, merge_run=None): +def submitFileToInstance(path, file, select_machine=None, merge_run=None, + testsuite=None): # Otherwise, assume it is a local url and submit to the default database # in the instance. instance = lnt.server.instance.Instance.frompath(path) @@ -80,24 +81,28 @@ raise ValueError("no default database in instance: %r" % (path,)) session = db.make_session() return lnt.util.ImportData.import_and_report( - config, db_name, db, session, file, format='', ts_name='nts', - select_machine=select_machine, merge_run=merge_run) + config, db_name, db, session, file, format='', + ts_name=testsuite or 'nts', select_machine=select_machine, + merge_run=merge_run) -def submitFile(url, file, verbose, select_machine=None, merge_run=None): +def submitFile(url, file, verbose, select_machine=None, merge_run=None, + testsuite=None): # If this is a real url, submit it using urllib. if '://' in url: result = submitFileToServer(url, file, select_machine, merge_run) else: - result = submitFileToInstance(url, file, select_machine, merge_run) + result = submitFileToInstance(url, file, select_machine, merge_run, + testsuite) return result -def submitFiles(url, files, verbose, select_machine=None, merge_run=None): +def submitFiles(url, files, verbose, select_machine=None, merge_run=None, + testsuite=None): results = [] for file in files: result = submitFile(url, file, verbose, select_machine=select_machine, - merge_run=merge_run) + merge_run=merge_run, testsuite=testsuite) if result: results.append(result) return results