Merge lp:~elopio/snappy/adt-run-b into lp:~snappy-dev/snappy/snappy-moved-to-github

Proposed by Leo Arias
Status: Merged
Approved by: Federico Gimenez
Approved revision: 727
Merged at revision: 728
Proposed branch: lp:~elopio/snappy/adt-run-b
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 25 lines (+2/-2)
2 files modified
_integration-tests/testutils/autopkgtest/autopkgtest_test.go (+1/-1)
_integration-tests/testutils/autopkgtest/ssh.go (+1/-1)
To merge this branch: bzr merge lp:~elopio/snappy/adt-run-b
Reviewer Review Type Date Requested Status
Federico Gimenez (community) Approve
Review via email: mp+272865@code.launchpad.net

Commit message

On the integration tests, print the boot log to stdout.

To post a comment you must log in.
Revision history for this message
Federico Gimenez (fgimenez) wrote :

Very useful Leo, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest_test.go'
--- _integration-tests/testutils/autopkgtest/autopkgtest_test.go 2015-08-31 10:09:21 +0000
+++ _integration-tests/testutils/autopkgtest/autopkgtest_test.go 2015-09-30 04:40:06 +0000
@@ -192,7 +192,7 @@
192}192}
193193
194func adtrunLocalCmd(controlFile, sourceCodePath, outputDir, imgPath string) string {194func adtrunLocalCmd(controlFile, sourceCodePath, outputDir, imgPath string) string {
195 options := fmt.Sprintf("--- ssh -s /usr/share/autopkgtest/ssh-setup/snappy -- -i %s", imgPath)195 options := fmt.Sprintf("--- ssh -s /usr/share/autopkgtest/ssh-setup/snappy -- -b -i %s", imgPath)
196 return adtrunCommonCmd(controlFile, sourceCodePath, outputDir, options)196 return adtrunCommonCmd(controlFile, sourceCodePath, outputDir, options)
197}197}
198198
199199
=== modified file '_integration-tests/testutils/autopkgtest/ssh.go'
--- _integration-tests/testutils/autopkgtest/ssh.go 2015-08-31 10:09:21 +0000
+++ _integration-tests/testutils/autopkgtest/ssh.go 2015-09-30 04:40:06 +0000
@@ -33,7 +33,7 @@
3333
34func kvmSSHOptions(imagePath string) string {34func kvmSSHOptions(imagePath string) string {
35 return fmt.Sprint(commonSSHOptions,35 return fmt.Sprint(commonSSHOptions,
36 "-s /usr/share/autopkgtest/ssh-setup/snappy -- -i ", imagePath)36 "-s /usr/share/autopkgtest/ssh-setup/snappy -- -b -i ", imagePath)
37}37}
3838
39func remoteTestbedSSHOptions(testbedIP string, testbedPort int) string {39func remoteTestbedSSHOptions(testbedIP string, testbedPort int) string {

Subscribers

People subscribed via source and target branches