summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-07-23 20:24:48 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-23 18:33:59 -0400
commit19cf94b81b2c22c9baf73190e977cf2bc33d2450 (patch)
treeca917d1fa51a61da28eda4dc2e8cb7040d6ea3f0
parent54c027a1d92fedc25d8f51a5c8571f39144144c6 (diff)
downloadjenkins.debian.net-19cf94b81b2c22c9baf73190e977cf2bc33d2450.tar.xz
lvc: forget live_screenshots, since we don't see them on pb10 anyway
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/lvc.sh12
-rw-r--r--cucumber/features/step_definitions/snapshots.rb19
2 files changed, 6 insertions, 25 deletions
diff --git a/bin/lvc.sh b/bin/lvc.sh
index 3b26c907..4403f724 100755
--- a/bin/lvc.sh
+++ b/bin/lvc.sh
@@ -35,12 +35,12 @@ fi
cleanup_all() {
find . -name \*.vlog.png -print0 | xargs -0 -r rm
- echo "Trying to preserve last screenshot…"
- LAST_SCREENSHOT=$(ls -t1 $RESULTS/*.png | head -1)
- if [ -e "$LAST_SCREENSHOT" ] ; then
- cp $LAST_SCREENSHOT $WORKSPACE/screenshot.png
- convert $WORKSPACE/screenshot.png -adaptive-resize 128x96 $WORKSPACE/screenshot-thumb.png
- fi
+ #echo "Trying to preserve last screenshot…"
+ #LAST_SCREENSHOT=$(ls -t1 $RESULTS/*.png | head -1)
+ #if [ -e "$LAST_SCREENSHOT" ] ; then
+ # cp $LAST_SCREENSHOT $WORKSPACE/screenshot.png
+ # convert $WORKSPACE/screenshot.png -adaptive-resize 128x96 $WORKSPACE/screenshot-thumb.png
+ #fi
}
fetch_if_newer() {
diff --git a/cucumber/features/step_definitions/snapshots.rb b/cucumber/features/step_definitions/snapshots.rb
index 4552ce5f..5583fb2e 100644
--- a/cucumber/features/step_definitions/snapshots.rb
+++ b/cucumber/features/step_definitions/snapshots.rb
@@ -51,27 +51,11 @@ def checkpoints
return cp
end
-def live_screenshot()
- debug_log("debug: publishing live screenshot.")
- screen_capture = @screen.capture
- p = screen_capture.getFilename
- if File.exist?(p)
- s = ENV['WORKSPACE']
- s_path = "#{s}/screenshot.png"
- FileUtils.mv(p, s_path)
- convert = IO.popen(['convert',
- s_path, '-adaptive-resize', '128x96', "#{s}/screenshot-thumb.png",
- :err => ['/dev/null', 'w'],
- ])
- end
-end
-
def reach_checkpoint(name)
scenario_indent = " "*4
step_indent = " "*6
step "a computer"
- live_screenshot
if VM.snapshot_exists?(name)
$vm.restore_snapshot(name)
post_snapshot_restore_hook
@@ -104,16 +88,13 @@ def reach_checkpoint(name)
debug_log(scenario_indent +
"Step failed while creating checkpoint: #{s}",
:color => :red)
- live_screenshot
raise e
end
- live_screenshot
debug_log(step_indent + "#{step_action} #{s}", :color => :green)
step_action = "And"
end
$vm.save_snapshot(name)
end
- live_screenshot
end
# For each checkpoint we generate a step to reach it.