Merge lp:~elopio/snappy/licensed_test into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

[Leo Arias (elopio)]

@Chipaca, maybe you can give us a hand here. I don't understand why the CombinedOutput of the command only shows:

Installing licensed.canonical\nlicensed failed to install: license not accepted\n

Where did the rest of the output go?

[Leo Arias (elopio)]

To reproduce:

$ go run ./_integration-tests/main.go --filter licensedExampleSuite

[John Lenton (chipaca)]

Just to document (and expand a little) what I told elopio on IRC, the problem is that snappy checks whether it's running on a tty and uses a different "progress bar" kind of thing, which includes the functionality for checking for license acceptance. If you don't have a tty, you get a nop.

Two ways around it: change the test so it's snappy is running under a tty (using a pseudo tty), or, http://pastebin.ubuntu.com/12971806/ and set that env var when running a test that needs it.

[lp:~elopio/snappy/licensed_test]

785. By Leo Arias on 2015-10-27

Added an environment variable to overwrite the terminal check.

786. By Leo Arias on 2015-10-27

Set the env ar during the test.

Unmerged revisions

786. By Leo Arias on 2015-10-27

Set the env ar during the test.

785. By Leo Arias on 2015-10-27

Added an environment variable to overwrite the terminal check.

784. By Leo Arias on 2015-10-26

Simplify the test to show the problem.

783. By Leo Arias on 2015-10-26

Merged with trunk.

782. By Leo Arias on 2015-10-20

Test

781. By Leo Arias on 2015-10-20

Merged with prerequisite.

=== modified file '_integration-tests/tests/examples_test.go'
--- _integration-tests/tests/examples_test.go	2015-10-19 23:12:30 +0000
+++ _integration-tests/tests/examples_test.go	2015-10-27 00:54:02 +0000
@@ -24,6 +24,7 @@
 	"io/ioutil"
 	"net/http"
 	"os"
+	"os/exec"
 
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
@@ -172,3 +173,29 @@
 		c.Assert(output, check.Equals, t.message, check.Commentf("Wrong message"))
 	}
 }
+
+var _ = check.Suite(&licensedExampleSuite{})
+
+type licensedExampleSuite struct {
+	common.SnappySuite
+}
+
+func (s *licensedExampleSuite) TestAcceptLicenseMustInstallSnap(c *check.C) {
+	originalValue := os.Getenv("SNAPPY_HAS_TERMINAL")
+	defer os.Setenv("SNAPPY_HAS_TERMINAL", originalValue)
+	
+	cmd := exec.Command("sudo", "snappy", "install", "licensed.canonical")
+	output, _ := cmd.CombinedOutput()
+
+	expected := "Installing licensed.canonical\n" +
+		"Starting download of licensed\n" +
+		".*\n" +
+		"Done\n" +
+		"licensed requires that you accept the following license before continuing\n" +
+		"This product is meant for educational purposes only. .* No other warranty expressed or implied.\n" +
+		"\n" +
+		"Do you agree? [y/n] "
+	c.Assert(string(output), check.Matches, expected)
+
+	defer common.RemoveSnap(c, "licensed.canonical")
+}

=== modified file 'progress/progress.go'
--- progress/progress.go	2015-06-03 11:48:37 +0000
+++ progress/progress.go	2015-10-27 00:54:02 +0000
@@ -198,6 +198,9 @@
 // attachedToTerminal returns true if the calling process is attached to
 // a terminal device.
 var attachedToTerminal = func() bool {
+	if os.Getenv("SNAPPY_HAS_TERMINAL") != "" {
+		return true
+	}
 	fd := int(os.Stdin.Fd())
 
 	return isatty(fd)

=== modified file 'progress/progress_test.go'
--- progress/progress_test.go	2015-06-08 14:25:07 +0000
+++ progress/progress_test.go	2015-10-27 00:54:02 +0000
@@ -148,3 +148,14 @@
 	c.Assert(pbar, FitsTypeOf, &NullProgress{})
 
 }
+
+func (ts *ProgressTestSuite) TestSnappyHasTerminalEnvVar(c *C) {
+	originalValue := os.Getenv("SNAPPY_HAS_TERMINAL")
+	defer os.Setenv("SNAPPY_HAS_TERMINAL", originalValue)
+	
+	os.Setenv("SNAPPY_HAS_TERMINAL", "1")
+	c.Assert(attachedToTerminal(), Equals, true)
+
+	os.Setenv("SNAPPY_HAS_TERMINAL", "")
+	c.Assert(attachedToTerminal(), Equals, false)
+}