Let lnt submit print the URL of the resulting run

[MatzeB]

Summary

This makes it easier for automatic processing to figure out the id that
was assigned to the submitted build.

Also refactored the server_wrapper.sh so it can be reused and for an lnt submit test.

[MatzeB]

Fix comment in server_wrapper.sh

[cmatthews]

Looks good. Thanks!

lnt/lnttool/main.py

def action_checkformat(name, args):
     import lnt.server.config
     db = lnt.server.db.v4db.V4DB('sqlite:///:memory:',
                                  lnt.server.config.Config.dummy_instance())
     result = lnt.util.ImportData.import_and_report(
         None, None, db, input, 'json', commit = True)
     lnt.util.ImportData.print_report_result(result, sys.stdout, sys.stderr,
                                             verbose = True)
 
+
+def _print_result_url(results, verbose):
+    result_url = results.get('result_url')
+    if result_url is not None:
+        if verbose:
+            print "Results available at:", result_url
+        else:
+            print result_url
+    elif verbose:
+        print "Results available at: no URL available"
+
+
 def action_runtest(name, args):
     """run a builtin test application"""
 
     # Runtest accepting options is deprecated, but lets not break the
     # world, so collect them anyways and pass them on.
     parser = OptionParser("%s test-name [options]" % name)
     parser.disable_interspersed_args()
     parser.add_option("", "--submit", dest="submit", type=str, default=None)
def action_runtest(name, args):
     logger.addHandler(handler)
     import lnt.tests
     try:
         test_instance = lnt.tests.get_test_instance(test_name)
     except KeyError:
         parser.error('invalid test name %r' % test_name)
 
     server_results = test_instance.run_test('%s %s' % (name, test_name), args)
-    if server_results.get('result_url'):
-        print "Results available at:", server_results['result_url']
-    else:
-        print "Results available at: no URL available"
+    _print_result_url(server_results, verbose=True)
 
 
 def action_showtests(name, args):
     """show the available built-in tests"""
 
     parser = OptionParser("%s" % name)
     (opts, args) = parser.parse_args(args)
     if len(args) != 0:
def action_submit(name, args):
 
     if not opts.commit:
         warning("submit called with --commit=0, your results will not be saved"
                 " at the server.")
 
     from lnt.util import ServerUtil
     files = ServerUtil.submitFiles(args[0], args[1:],
                                    opts.commit, opts.verbose)
-    if opts.verbose:
-        for f in files:
+        if opts.verbose:
             lnt.util.ImportData.print_report_result(f, sys.stdout,
                                                     sys.stderr, True)
+        _print_result_url(f, opts.verbose)
+
 
 def action_update(name, args):
     """create and or auto-update the given database"""
 
     parser = OptionParser("%s [options] <db path>" % name)
     parser.add_option("", "--show-sql", dest="show_sql", default=False,
                       action="store_true", help="show all SQL queries")
 

tests/SharedInputs/sample-report.json

+{
+    "Machine": {
+        "Info": {
+          "os": "SAMPLE OS",
+          "hardware": "x86_64"
+        }, 
+        "Name": "LNT SAMPLE MACHINE"
+    },
+    "Run": {
+      "Start Time": "2009-11-17 02:12:25",
+      "End Time": "2009-11-17 03:44:48",
+      "Info": {
+      "run_order": "1",
+      "tag": "nts",
+        "__report_version__": "1"
+    }
+  },
+  "Tests": [
+        {
+            "Data": [
+                0.6995
+            ], 
+            "Info": {}, 
+            "Name": "nts.SingleSource/Benchmarks/Adobe-C++/functionobjects.compile"
+        }, 
+        {
+            "Data": [
+                "49333a87d501b0aea2191830b66b5eec"
+            ], 
+            "Info": {}, 
+            "Name": "nts.SingleSource/Benchmarks/Adobe-C++/functionobjects.hash"
+        }, 
+        {
+            "Data": [
+                2.2521
+            ], 
+            "Info": {}, 
+            "Name": "nts.SingleSource/Benchmarks/Adobe-C++/functionobjects.exec"
+        }, 
+        {
+            "Data": [
+                0.1234
+            ], 
+            "Info": {}, 
+            "Name": "nts.SingleSource/Benchmarks/Adobe-C++/functionobjects-link.compile"
+        }, 
+        {
+            "Data": [
+                12432.0
+            ], 
+            "Info": {}, 
+            "Name": "nts.SingleSource/Benchmarks/Adobe-C++/functionobjects.code_size"
+        }
+  ]
+}

tests/SharedInputs/server_wrapper.sh

 #!/bin/bash
 # This script wraps a call to lnt runtest with a local server
 # instance.  It is intended for testing full runtest invocations
-# that need a real server instnace to work.
-# ./runtest_server_wrapper <location of server files> <runtest type> <submit-through-url> <portnr> [arguments for lnt runtest]
-# ./runtest_server_wrapper /tmp/ nt --cc /bin/clang --sandbox /tmp/sandbox
+# that need a real server instance to work. Starts a server at
+# `http://localhost:8098`.
+# ./server_wrapper <location of server files> <command>
+# Example:
+# ./server_wrapper /tmp lnt runtest nt --submit "http://localhost:8098/db_default/submitRun" --cc /bin/clang --sandbox /tmp/sandbox
 
 # First launch the server.
 
 PROGRAM="$(basename $0)"
 
 usage() {
   echo "usage: $PROGRAM <location of server files> <runtest type> <submit-through-url> <portnr> [arguments for lnt runtest]"
   echo "e.g:   $PROGRAM /tmp/ nt yes --cc /bin/clang --sandbox /tmp/sandbox"
 }
 
 error() {
   echo "error: $PROGRAM: $*" >&2
   usage >&2
   exit 1
 }
 
 main() {
   [ $# -lt 2 ] &&
     error "not enough arguments"
 
   local serverinstance=$1
-  local portnr=$4
-  lnt runserver $serverinstance --hostname localhost --port $portnr &
+  shift 1
+
+  local portnr=9089
+  lnt runserver $serverinstance --hostname localhost --port $portnr >& $serverinstance/server_wrapper_runserver.log &
+  sleep 1 # Give the server some time to start.
   local pid=$!
-  local type=$2
-  local submit_through_url=$3
-  shift 4
-  case $submit_through_url in
-      [yY][eE][sS]|[yY])
-          submit_pointer=http://localhost:$portnr/db_default/submitRun
-    ;;
-      *)
-          submit_pointer=$serverinstance
-    ;;
-  esac
-  lnt runtest $type --submit $submit_pointer $@
+
+  SERVER_URL="http://localhost:$portnr" eval "$@"
   local rc=$?
 
   kill -15 $pid
   local kill_rc=$?
   [ $kill_rc -ne 0 ] &&
       error "wha happen??  $kill_rc"
   
   wait $pid
   exit $rc
 }
 
 main "$@"

tests/lnttool/submit.py

+# RUN: rm -rf %t.instance
+# RUN: python %{shared_inputs}/create_temp_instance.py \
+# RUN:   %s %{shared_inputs}/SmallInstance %t.instance
+# RUN: %{shared_inputs}/server_wrapper.sh %t.instance \
+# RUN:    lnt submit "http://localhost:9089/db_default/submitRun" --commit=1 \
+# RUN:       %{shared_inputs}/sample-report.json | \
+# RUN:    FileCheck %s --check-prefix=CHECK-DEFAULT
+#
+# CHECK-DEFAULT: http://localhost:9089/db_default/v4/nts/3
+#
+# RUN: rm -rf %t.instance
+# RUN: python %{shared_inputs}/create_temp_instance.py \
+# RUN:   %s %{shared_inputs}/SmallInstance %t.instance
+# RUN: %{shared_inputs}/server_wrapper.sh %t.instance \
+# RUN:    lnt submit "http://localhost:9089/db_default/submitRun" --commit=1 \
+# RUN:       %{shared_inputs}/sample-report.json -v | \
+# RUN:    FileCheck %s --check-prefix=CHECK-VERBOSE
+#
+# CHECK-VERBOSE: Import succeeded.
+# CHECK-VERBOSE: --- Tested: 10 tests --
+#
+# CHECK-VERBOSE: Imported Data
+# CHECK-VERBOSE: -------------
+# CHECK-VERBOSE: Added Machines: 1
+# CHECK-VERBOSE: Added Runs    : 1
+# CHECK-VERBOSE: Added Tests   : 2
+#
+# CHECK-VERBOSE: Results
+# CHECK-VERBOSE: ----------------
+# CHECK-VERBOSE: PASS : 10
+# CHECK-VERBOSE: Results available at: http://localhost:9089/db_default/v4/nts/3

tests/runtest/nt.py

 # RUN:   --qemu-flags '-device gus,irq=5 -test=escaped\ space -some-option="stay with me"' \
 # RUN:   --no-timestamp > %t.log 2> %t.err
 # RUN: FileCheck --check-prefix CHECK-QEMU-FLAG1 < %t.err %s
 # CHECK-QEMU-FLAG1: QEMU_USER_MODE_COMMAND: TEST -soundhw gus -net nic -device gus,irq=5 '-test=escaped space' '-some-option=stay with me'
 
 # Check submission to a server through url works:
 # RUN: rsync -av --exclude .svn %S/Inputs/rerun_server_instance/ \
 # RUN:   %{test_exec_root}/runtest/nt_server_instance
-# RUN: %S/Inputs/runtest_server_wrapper.sh \
-# RUN:   %{test_exec_root}/runtest/nt_server_instance nt yes 9089 \
+# RUN: %{shared_inputs}/server_wrapper.sh \
+# RUN:   %{test_exec_root}/runtest/nt_server_instance \
+# RUN:   lnt runtest nt --submit "http://localhost:9089/db_default/submitRun" \
 # RUN:   --sandbox %t.SANDBOX \
 # RUN:   --test-suite %S/Inputs/rerun-test-suite1 \
 # RUN:   --cc %{shared_inputs}/FakeCompilers/clang-r154331 \
 # RUN:   --no-timestamp --rerun --run-order 1 > %t.log 2> %t.err
 # RUN: FileCheck --check-prefix CHECK-SUBMIT-STDOUT < %t.log %s
 # RUN: FileCheck --check-prefix CHECK-SUBMIT-STDERR < %t.err %s
 
 # CHECK-SUBMIT-STDOUT: Import succeeded.

 # CHECK-SUBMIT-STDERR: capturing machine information
 # CHECK-SUBMIT-STDERR: generating report
 # CHECK-SUBMIT-STDERR: submitting result to
 # CHECK-SUBMIT-STDERR: Rerunning 0 of 69 benchmarks.
 
 # Check submission to a server through server instance works:
 # RUN: rsync -av --exclude .svn %S/Inputs/rerun_server_instance/ \
 # RUN:   %{test_exec_root}/runtest/nt_server_instance
-# RUN: %S/Inputs/runtest_server_wrapper.sh \
-# RUN:   %{test_exec_root}/runtest/nt_server_instance nt no 9089 \
+# RUN: %{shared_inputs}/server_wrapper.sh \
+# RUN:   %{test_exec_root}/runtest/nt_server_instance \
+# RUN:   lnt runtest nt --submit "http://localhost:9089/db_default/submitRun" \
 # RUN:   --sandbox %t.SANDBOX \
 # RUN:   --test-suite %S/Inputs/rerun-test-suite1 \
 # RUN:   --cc %{shared_inputs}/FakeCompilers/clang-r154331 \
 # RUN:   --no-timestamp --rerun --run-order 1 > %t.log 2> %t.err
 # RUN: FileCheck --check-prefix CHECK-SUBMIT-STDOUT < %t.log %s
 # RUN: FileCheck --check-prefix CHECK-SUBMIT-STDERR < %t.err %s

tests/runtest/rerun.py

 # Testing for the rerun feature of LNT nt.
 # This test runs two stub test suites. The second one has different values for
 # some of the test, so they should be marked as regressions, and reruns should
 # be triggered.
 
 # RUN: mkdir -p %{test_exec_root}/runtest/server_instance
 # RUN: rsync -av --exclude .svn %S/Inputs/rerun_server_instance/ \
 # RUN:   %{test_exec_root}/runtest/rerun_server_instance
 # RUN: rm -f CHECK-STDOUT CHECK-STDOUT2 CHECK-STDERR CHECK-STDERR2
-# RUN: %S/Inputs/runtest_server_wrapper.sh \
-# RUN:   %{test_exec_root}/runtest/rerun_server_instance nt yes 9090 \
+# RUN: %{shared_inputs}/server_wrapper.sh \
+# RUN:   %{test_exec_root}/runtest/rerun_server_instance \
+# RUN:   lnt runtest nt --submit "http://localhost:9089/db_default/submitRun" \
 # RUN:   --sandbox %t.SANDBOX \
 # RUN:   --test-suite %S/Inputs/rerun-test-suite1 \
 # RUN:   --cc %{shared_inputs}/FakeCompilers/clang-r154331 \
 # RUN:   --no-timestamp --rerun --run-order 1 > %t.log 2> %t.err
 # RUN: FileCheck --check-prefix CHECK-STDOUT < %t.log %s
 # RUN: FileCheck --check-prefix CHECK-STDERR < %t.err %s
 
 # CHECK-STDOUT: Import succeeded.
 # CHECK-STDOUT: Added Runs    : 1
 
 # CHECK-STDERR: inferred C++ compiler under test
 # CHECK-STDERR: checking source versions
 # CHECK-STDERR: using nickname
 # CHECK-STDERR: starting test
 # CHECK-STDERR: configuring
 # CHECK-STDERR: building test-suite tools
 # CHECK-STDERR: executing "nightly tests" with -j1
 # CHECK-STDERR: loading nightly test data
 # CHECK-STDERR: capturing machine information
 # CHECK-STDERR: generating report
 # CHECK-STDERR: submitting result to
 # CHECK-STDERR: Rerunning 0 of 69 benchmarks.
 
-# RUN: %S/Inputs/runtest_server_wrapper.sh \
-# RUN:   %{test_exec_root}/runtest/rerun_server_instance nt yes 9090 \
+# RUN: %{shared_inputs}/server_wrapper.sh \
+# RUN:   %{test_exec_root}/runtest/rerun_server_instance \
+# RUN:   lnt runtest nt --submit "http://localhost:9089/db_default/submitRun" \
 # RUN:   --sandbox %t.SANDBOX2 \
 # RUN:   --test-suite %S/Inputs/rerun-test-suite2 \
 # RUN:   --cc %{shared_inputs}/FakeCompilers/clang-r154331 \
 # RUN:   --no-timestamp --rerun --run-order 4 --verbose \
 # RUN:   > %t.2.log 2> %t.2.err || cat %t.2.err
 # RUN: echo "Run 2"
 # RUN: FileCheck --check-prefix CHECK-STDOUT2 < %t.2.log %s
 # RUN: FileCheck --check-prefix CHECK-STDERR2 < %t.2.err %s