diff options
| -rw-r--r-- | lnt/lnttool/main.py | 4 | ||||
| -rw-r--r-- | lnt/server/ui/views.py | 4 | ||||
| -rw-r--r-- | lnt/tests/compile.py | 5 | ||||
| -rw-r--r-- | lnt/util/ImportData.py | 6 |
4 files changed, 15 insertions, 4 deletions
diff --git a/lnt/lnttool/main.py b/lnt/lnttool/main.py index fdff182..59f50e6 100644 --- a/lnt/lnttool/main.py +++ b/lnt/lnttool/main.py @@ -152,7 +152,9 @@ def action_runtest(name, args): except KeyError: parser.error('invalid test name %r' % test_name) - test_instance.run_test('%s %s' % (name, test_name), args) + server_results = test_instance.run_test('%s %s' % (name, test_name), args) + print "Results available at:", server_results['result_url'] + def action_showtests(name, args): """show the available built-in tests""" diff --git a/lnt/server/ui/views.py b/lnt/server/ui/views.py index cc10943..ba69ef4 100644 --- a/lnt/server/ui/views.py +++ b/lnt/server/ui/views.py @@ -118,6 +118,10 @@ def submit_run(): result = lnt.util.ImportData.import_and_report( current_app.old_config, g.db_name, db, path, '<auto>', commit) + # It is nice to have a full URL to the run, so fixup the request URL + # here were we know more about the flask instance. + result['result_url'] = request.url_root + result['result_url'] + return flask.jsonify(**result) return render_template("submit_run.html") diff --git a/lnt/tests/compile.py b/lnt/tests/compile.py index 7dd8101..88905b9 100644 --- a/lnt/tests/compile.py +++ b/lnt/tests/compile.py @@ -1034,9 +1034,10 @@ class CompileTest(builtintest.BuiltinTest): if opts.output is not None: self.print_report(report, opts.output) - self.submit(lnt_report_path, opts) + server_report = self.submit(lnt_report_path, opts) + + return server_report - return report def create_instance(): return CompileTest() diff --git a/lnt/util/ImportData.py b/lnt/util/ImportData.py index fb87889..5a93844 100644 --- a/lnt/util/ImportData.py +++ b/lnt/util/ImportData.py @@ -92,7 +92,11 @@ def import_and_report(config, db_name, db, file, format, commit=False, if config: report_url = "%s/db_%s/" % (config.zorgURL, db_name) else: - report_url = 'localhost' + report_url = "localhost" + # Add a handy relative link to the submitted run. + ts_name = data['Run']['Info'].get('tag') + result['result_url'] = "db_{}/v4/{}/{}".format(db_name, ts_name, run.id) + if not disable_report: NTEmailReport.emailReport(result, db, run, report_url, email_config, toAddress, success, commit) |