Merge lp:~sergiusens/goget-ubuntu-touch/1473333 into lp:goget-ubuntu-touch

[Sergio Schvezov]

exit(1) on parse errors.

[Leo Arias (elopio)]

The exit(1) works. I don't understand the test and when I try to run it I get:

./main_test.go:36: undefined: execute

Maybe I'm not running it properly?

[Sergio Schvezov (sergiusens)]

On Fri, Nov 13, 2015 at 12:18 AM, Leo Arias <email address hidden> wrote:

> The exit(1) works. I don't understand the test and when I try to run it I
> get:
>
> ./main_test.go:36: undefined: execute
>
> Maybe I'm not running it properly?
>

Maybe I messed up ;-) Forgot to push something, should work now

[Leo Arias (elopio)]

+// ubuntu-device-flash - handles ubuntu disk images

You left here the comment from the other package.

And:

./main_test.go:23: imported and not used: "fmt"

review: Needs Fixing

[lp:~sergiusens/goget-ubuntu-touch/1473333]

218. By Sergio Schvezov on 2015-11-13

exit(1) on parse errors.

[Leo Arias (elopio)]

The test passes now.

review: Approve

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'ubuntu-device-flash/main.go'
--- ubuntu-device-flash/main.go	2015-04-13 13:29:36 +0000
+++ ubuntu-device-flash/main.go	2015-11-13 15:19:39 +0000
@@ -43,8 +43,10 @@
 var cacheDir = ubuntuimage.GetCacheDir()
 
 func main() {
-	args := os.Args
+	execute(os.Args)
+}
 
+func execute(args []string) {
 	if v := os.Getenv("MANPAGE"); v != "" {
 		manpagePath := "/tmp/ubuntu-device-flash.manpage"
 		w, err := os.Create(manpagePath)
@@ -61,7 +63,7 @@
 
 	if _, err := parser.ParseArgs(args); err != nil {
 		fmt.Println(err)
-		return
+		os.Exit(1)
 	}
 
 }

=== added file 'ubuntu-device-flash/main_test.go'
--- ubuntu-device-flash/main_test.go	1970-01-01 00:00:00 +0000
+++ ubuntu-device-flash/main_test.go	2015-11-13 15:19:39 +0000
@@ -0,0 +1,46 @@
+//
+// ubuntu-device-flash - handles ubuntu disk images
+//
+// Copyright (c) 2015 Canonical Ltd.
+//
+// Written by Sergio Schvezov <[e-mail]>
+//
+package main
+
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 3, as published
+// by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranties of
+// MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+// PURPOSE.  See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import (
+	"os"
+	"os/exec"
+
+	. "launchpad.net/gocheck"
+)
+
+type ParserTestSuite struct{}
+
+var _ = Suite(&ParserTestSuite{})
+
+func (s *ParserTestSuite) TestExitStatusOnBadArgs(c *C) {
+	if os.Getenv("BE_CRASHER") == "1" {
+		execute([]string{"./ubuntu-device-flash", "--verbose", "core", "--output=/tmp/snappy.img", "--developer-mode"})
+		return
+	}
+
+	cmd := exec.Command(os.Args[0], "-gocheck.f", "ParserTestSuite.TestExitStatusOnBadArgs")
+	cmd.Env = append(os.Environ(), "BE_CRASHER=1")
+	out, err := cmd.CombinedOutput()
+	e, ok := err.(*exec.ExitError)
+	c.Assert(ok, Equals, true)
+	c.Assert(e.Success(), Equals, false)
+	c.Assert(string(out), Equals, "the required argument `release` was not provided\n")
+}