Merge lp:~fgimenez/snappy/extended-ssh-timeout into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

Extended ssh timeout

Extended ssh timeout

[Leo Arias (elopio)]

Great. +1, waiting for the new adt-run release.

review: Approve

=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest_test.go'
--- _integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-08-25 16:59:19 +0000
+++ _integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-08-31 11:22:22 +0000
@@ -199,7 +199,8 @@
 func adtrunRemoteCmd(controlFile, sourceCodePath, outputDir, testbedIP string, testbedPort int) string {
 	port := strconv.Itoa(testbedPort)
 	idFile := filepath.Join(os.Getenv("HOME"), ".ssh", "id_rsa")
-	options := fmt.Sprintf("--- ssh -H %s -p %s -l ubuntu -i %s --reboot", testbedIP, port, idFile)
+	options := fmt.Sprintf("--- ssh -H %s -p %s -l ubuntu -i %s --reboot --timeout-ssh %d",
+		testbedIP, port, idFile, sshTimeout)
 
 	return adtrunCommonCmd(controlFile, sourceCodePath, outputDir, options)
 }

=== modified file '_integration-tests/testutils/autopkgtest/ssh.go'
--- _integration-tests/testutils/autopkgtest/ssh.go	2015-08-07 15:58:38 +0000
+++ _integration-tests/testutils/autopkgtest/ssh.go	2015-08-31 11:22:22 +0000
@@ -26,7 +26,10 @@
 	"strconv"
 )
 
-const commonSSHOptions = "--- ssh "
+const (
+	commonSSHOptions = "--- ssh "
+	sshTimeout       = 600
+)
 
 func kvmSSHOptions(imagePath string) string {
 	return fmt.Sprint(commonSSHOptions,
@@ -39,5 +42,6 @@
 		" -p ", strconv.Itoa(testbedPort),
 		" -l ubuntu",
 		" -i ", filepath.Join(os.Getenv("HOME"), ".ssh", "id_rsa"),
-		" --reboot")
+		" --reboot",
+		" --timeout-ssh ", strconv.Itoa(sshTimeout))
 }