From 217b3b31067e7e1fbef201131624a64cf36f255e Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Tue, 20 Nov 2012 17:24:05 +0000
Subject: [PATCH] Mark upgrade feature as manual. Remove related resources.

---
 src/test/cucumber/gvm/upgrade.feature |   1 +
 src/test/groovy/gvm/VertxUtils.groovy |   6 +++---
 src/test/resources/res.zip            | Bin 2299 -> 0 bytes
 src/test/resources/selfupdate.sh      |  21 ---------------------
 4 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 src/test/resources/res.zip
 delete mode 100755 src/test/resources/selfupdate.sh

diff --git a/src/test/cucumber/gvm/upgrade.feature b/src/test/cucumber/gvm/upgrade.feature
index 9a6613c1..30f4e0bb 100644
--- a/src/test/cucumber/gvm/upgrade.feature
+++ b/src/test/cucumber/gvm/upgrade.feature
@@ -1,5 +1,6 @@
 Feature: Upgrade
 
+	@manual
 	Scenario: Upgrade an outdated installation
 		Given an initialised system
 		When I enter "gvm selfupdate"
diff --git a/src/test/groovy/gvm/VertxUtils.groovy b/src/test/groovy/gvm/VertxUtils.groovy
index f76760f7..271803df 100644
--- a/src/test/groovy/gvm/VertxUtils.groovy
+++ b/src/test/groovy/gvm/VertxUtils.groovy
@@ -30,15 +30,15 @@ class VertxUtils {
 		def rm = new RouteMatcher()
 
 		rm.get("/") { req ->
-			req.response.sendFile('srv/scripts/install.sh')
+			req.response.sendFile('build/scripts/install.sh')
 		}
 
 		rm.get("/selfupdate") { req ->
-			req.response.sendFile('src/test/resources/selfupdate.sh')
+			req.response.sendFile('build/scripts/selfupdate.sh')
 		}
 
 		rm.get("/res") { req ->
-			req.response.sendFile('src/test/resources/res.zip')
+			req.response.sendFile('build/distributions/gvm-scripts.zip')
 		}
 
 		rm.get("/candidates") { req ->
diff --git a/src/test/resources/res.zip b/src/test/resources/res.zip
deleted file mode 100644
index 545e08d5a108f0f44b22a2e7e3b8bc59b8b6e1cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2299
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
V5}}OQkNj@39)|N_4hH?M{srZzFaiJo

diff --git a/src/test/resources/selfupdate.sh b/src/test/resources/selfupdate.sh
deleted file mode 100755
index 5ecfc989..00000000
--- a/src/test/resources/selfupdate.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-echo "Updating gvm scripts..."
-TMP_ZIP="/tmp/res.zip"
-BIN_FOLDER="/tmp/gvm/bin"
-
-echo "Creating $BIN_FOLDER"
-mkdir -p "$BIN_FOLDER"
-
-echo "Calling $GVM_SERVICE/res?platform=$PLATFORM"
-curl -s "$GVM_SERVICE/res?platform=$PLATFORM" > "$TMP_ZIP"
-
-echo "Unzip to $BIN_FOLDER"
-unzip -qo "$TMP_ZIP" -d "$BIN_FOLDER"
-rm "$TMP_ZIP"
-
-chmod +x "$BIN_FOLDER"/*
-
-echo ""
-echo "Successfully upgraded GVM."
-echo ""