Merge lp:~fgimenez/snappy/udf-revision into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

New format for passing the revision parameter in udf

New format for passing the revision parameter in udf

[Leo Arias (elopio)]

why is this needed? I'm testing it with the latest udf and it works without the =.
I'm not opposed to this, it looks fine. just wondering if it's a pure cosmetic thing.

review: Needs Fixing

[Leo Arias (elopio)]

review: Needs Information

[Federico Gimenez (fgimenez)]

I'm getting this error when a revision flag is given:

$ go run _integration-tests/main.go -revision=-1
Building tests...
go test -c ./_integration-tests/tests
Writing test config...
{_integration-tests/data/output/testconfig.json rolling edge false false false}
Creating image...
sudo ubuntu-device-flash --verbose --revision -1 core rolling --output /tmp/snappy-test/image/snappy-rolling-edge--1.img --channel edge --developer-mode
expected argument for flag `--revision', but got option `-1'

Never used this revision flag before :) it'll be useful for sure for automated upgrade tests

[Leo Arias (elopio)]

Right, I didn't try with -#, just with #.

review: Approve

=== modified file '_integration-tests/testutils/image/image.go'
--- _integration-tests/testutils/image/image.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/testutils/image/image.go	2015-09-15 09:33:35 +0000
@@ -51,7 +51,7 @@
 	udfCommand := []string{"sudo", "ubuntu-device-flash", "--verbose"}
 
 	if img.revision != "" {
-		udfCommand = append(udfCommand, "--revision", img.revision)
+		udfCommand = append(udfCommand, "--revision="+img.revision)
 	}
 
 	imagePath := img.imagePath(imageDir)