diff options
author | Philip Hands <phil@hands.com> | 2017-06-29 22:11:09 +0200 |
---|---|---|
committer | Holger Levsen <holger@layer-acht.org> | 2017-08-01 00:53:58 -0400 |
commit | a6f41c35e337db192e612ee6e1545fcae4c69ac7 (patch) | |
tree | 3d03ff353fee11bb00de060f73c6b4d040173e9a /cucumber/bin | |
parent | c49069662ccf276a7b97f77524f3e2638c9fa152 (diff) | |
download | jenkins.debian.net-a6f41c35e337db192e612ee6e1545fcae4c69ac7.tar.xz |
lvc: grab updates from tails (01371c19bd..6ae59c49e5)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber/bin')
-rwxr-xr-x | cucumber/bin/run_test_suite | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/cucumber/bin/run_test_suite b/cucumber/bin/run_test_suite index 19128445..f7903639 100755 --- a/cucumber/bin/run_test_suite +++ b/cucumber/bin/run_test_suite @@ -20,13 +20,15 @@ libvirt-clients libvirt-daemon-system libvirt-dev libvirt0 -openjdk-7-jre +obfs4proxy openssh-server ovmf +pry python-jabberbot python-potr qemu-kvm qemu-system-x86 +redir ruby-guestfs ruby-json ruby-libvirt @@ -38,6 +40,7 @@ ruby-rspec ruby-test-unit seabios tcpdump +tor unclutter virt-viewer xvfb @@ -59,9 +62,10 @@ Options for '@product' features: encoding. Requires x264. --capture-all Keep videos for all scenarios, including those that succeed (implies --capture). - --pause-on-fail On failure, pause test suite until pressing Enter. This is - useful for investigating the state of the VM guest to see - exactly why a test failed. + --interactive-debugging + On failure, pause test suite until pressing Enter. Also + offer the option to open an interactive Ruby shell (pry) + in the Cucumber world's context. --keep-snapshots Don't ever delete any snapshots (including ones marked as temporary). This can be a big time saver when debugging new features. @@ -74,7 +78,7 @@ Options for '@product' features: (default is TMPDIR in the environment, and if unset, /tmp/DebianToaster). --view Shows the test session in a windows. Requires x11vnc - and xtightvncviewer. + and tigervnc-viewer. --vnc-server-only Starts a VNC server for the test session. Requires x11vnc. --iso IMAGE Test '@product' features using IMAGE. --old-iso IMAGE For some '@product' features (e.g. usb_install) we need @@ -159,8 +163,8 @@ start_vnc_server() { } start_vnc_viewer() { - check_dependencies xtightvncviewer - xtightvncviewer -viewonly localhost:${VNC_SERVER_PORT} 1>/dev/null 2>&1 & + check_dependencies tigervnc-viewer + xtigervncviewer -nojpeg -viewonly localhost:${VNC_SERVER_PORT} 1>/dev/null 2>&1 & } capture_session() { @@ -181,13 +185,13 @@ CAPTURE_ALL= LOG_FILE= VNC_VIEWER= VNC_SERVER= -PAUSE_ON_FAIL= +INTERACTIVE_DEBUGGING= KEEP_SNAPSHOTS= SIKULI_RETRY_FINDFAILED= ISO= OLD_ISO= -LONGOPTS="artifacts-base-uri:,view,vnc-server-only,capture,capture-all,help,tmpdir:,keep-snapshots,retry-find,iso:,old-iso:,pause-on-fail" +LONGOPTS="artifacts-base-uri:,view,vnc-server-only,capture,capture-all,help,tmpdir:,keep-snapshots,retry-find,iso:,old-iso:,interactive-debugging" OPTS=$(getopt -o "" --longoptions $LONGOPTS -n "${NAME}" -- "$@") eval set -- "$OPTS" while [ $# -gt 0 ]; do @@ -213,8 +217,8 @@ while [ $# -gt 0 ]; do export CAPTURE="yes" export CAPTURE_ALL="yes" ;; - --pause-on-fail) - export PAUSE_ON_FAIL="yes" + --interactive-debugging) + export INTERACTIVE_DEBUGGING="yes" ;; --keep-snapshots) export KEEP_SNAPSHOTS="yes" |