From af104325a71a2cb98533581ca925b62a5afda668 Mon Sep 17 00:00:00 2001 From: Andrei Savu Date: Mon, 13 Feb 2012 14:38:01 +0200 Subject: [PATCH] Fixed broken build due to recent changes in labs/virtualbox --- ...nsTest.java => InstallGuestAdditionsLiveTest.java} | 11 +++++------ .../test/resources/test_guest_additions_installer.sh | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) rename labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/{InstallGuestAdditionsTest.java => InstallGuestAdditionsLiveTest.java} (94%) diff --git a/labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java b/labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsLiveTest.java similarity index 94% rename from labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java rename to labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsLiveTest.java index 1fb1bd419f..3a00404d18 100644 --- a/labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java +++ b/labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsLiveTest.java @@ -19,20 +19,19 @@ package org.jclouds.virtualbox.statements; -import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_IMAGE_PREFIX; - +import com.google.common.base.CaseFormat; +import com.google.inject.Injector; import org.jclouds.virtualbox.BaseVirtualBoxClientLiveTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import com.google.common.base.CaseFormat; -import com.google.inject.Injector; +import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_IMAGE_PREFIX; /** * @author Andrea Turli */ -@Test(groups = "live", singleThreaded = true, testName = "InstallGuestAdditionsTest") -public class InstallGuestAdditionsTest extends BaseVirtualBoxClientLiveTest { +@Test(groups = "live", singleThreaded = true, testName = "InstallGuestAdditionsLiveTest") +public class InstallGuestAdditionsLiveTest extends BaseVirtualBoxClientLiveTest { private String vmName; diff --git a/labs/virtualbox/src/test/resources/test_guest_additions_installer.sh b/labs/virtualbox/src/test/resources/test_guest_additions_installer.sh index 8af63cbff9..6d6e7bd1a8 100644 --- a/labs/virtualbox/src/test/resources/test_guest_additions_installer.sh +++ b/labs/virtualbox/src/test/resources/test_guest_additions_installer.sh @@ -13,9 +13,9 @@ function installModuleAssistantIfNeeded { if [ $OSNAME = 'Ubuntu' ] then echo "OS is Ubuntu" - apt-get -f -y -qq --force-yes install build-essential module-assistant && m-a prepare -i + apt-get -f -y -qq --force-yes install build-essential module-assistant; + m-a prepare -i fi - return 0 } export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin (mkdir -p /tmp/ && cd /tmp/ && [ ! -f VBoxGuestAdditions_4.1.6.iso ] && curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -C - -X GET http://download.virtualbox.org/virtualbox/4.1.6/VBoxGuestAdditions_4.1.6.iso >VBoxGuestAdditions_4.1.6.iso)