[LNT] Fixed incomplete feature for submit JSON to a local instance

[kpdev42]

Summary

LNT parses the test suite from the specified url for the submit command. But the suite is always default (nts) in case of using a local path to the instance instead of the url. This patch allows to specify the test suite in the submit command.

[thopre]

lnt/lnttool/main.py

188

194–197

Why is this necessary?

lnt/server/db/rules/rule_update_fixed_regressions.py

119

Spurious change, please split into a separate patch. Likewise for the two below whitespace changes

[slydiman]

lnt/lnttool/main.py

194–197

Note if the url contains the link to the server everything will be submitted and processed on the server where hooks and logs are already initialized. But if the url is a local path to the instance everything will be processed locally inside this process. It is necessary to register hooks to process regressions correctly. And it is necessary to init stdout logs too. Note the url condition is the same as in ServerUtil.py, line 92.

[kpdev42]

lnt/server/db/rules/rule_update_fixed_regressions.py

119

Removed from this patch

[kpdev42]

Removed cosmetic changes in lnt/server/db/rules/rule_update_fixed_regressions.py

[kpdev42]

Change help message for testsuite option

[thopre]

LGTM

lnt/lnttool/main.py

 """Implement the command line 'lnt' tool."""
 from __future__ import print_function
 from .common import init_logger
 from .common import submit_options
 from .convert import action_convert
 from .create import action_create
 from .import_data import action_import
 from .import_report import action_importreport
 from .updatedb import action_updatedb
 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
 
 
 @click.command("runserver", short_help="start a new development server")
 @click.argument("instance_path", type=click.UNPROCESSED)
 @click.option("--hostname", default="localhost", show_default=True,

 
 
 @click.command("submit")
 @click.argument("url")
 @click.argument("files", nargs=-1, type=click.Path(exists=True), required=True)
 @submit_options
 @click.option("--verbose", "-v", is_flag=True,
               help="show verbose test results")
-def action_submit(url, files, select_machine, merge, verbose):
[e-mail]("--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(
                 submitted_file, sys.stdout, sys.stderr, True)
         _print_result_url(submitted_file, verbose)
     if len(files) != len(results):
         sys.exit(1)
 

lnt/server/db/rules/rule_update_fixed_regressions.py

def regression_evolution(session, ts, run_id):
 
     # Remove the oldest detected regressions if needed.
     num_regression_to_keep = 50
     if len(detects) > num_regression_to_keep:
         changed += age_out_oldest_regressions(session, ts, num_regression_to_keep)
 
     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
 
     session.commit()
     logger.info("Changed the state of {} regressions".format(changed))
 
 
 post_submission_hook = regression_evolution

lnt/util/ServerUtil.py

except Exception:
         print("Traceback:")
         traceback.print_exc()
         print()
         print("Result:")
         print("error:", result_data)
         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)
     config = instance.config
     db_name = 'default'
     with contextlib.closing(config.get_database(db_name)) as db:
         if db is None:
             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='<auto>', ts_name='nts',
-            select_machine=select_machine, merge_run=merge_run)
+            config, db_name, db, session, file, format='<auto>',
+            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