Merge lp:~elopio/snappy/fix1507809-integration-ftb into lp:~snappy-dev/snappy/snappy-moved-to-github

Proposed by Leo Arias
Status: Merged
Approved by: Federico Gimenez
Approved revision: 780
Merged at revision: 786
Proposed branch: lp:~elopio/snappy/fix1507809-integration-ftb
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 33 lines (+0/-23)
1 file modified
_integration-tests/tests/examples_test.go (+0/-23)
To merge this branch: bzr merge lp:~elopio/snappy/fix1507809-integration-ftb
Reviewer Review Type Date Requested Status
Federico Gimenez (community) Approve
Review via email: mp+274961@code.launchpad.net

Commit message

Fixed the wrong merge in the examples tests.

Description of the change

There was a wrong merge that duplicated this test suite.

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

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '_integration-tests/tests/examples_test.go'
--- _integration-tests/tests/examples_test.go 2015-10-19 16:11:31 +0000
+++ _integration-tests/tests/examples_test.go 2015-10-19 23:13:29 +0000
@@ -114,29 +114,6 @@
114 c.Assert(string(body), check.Equals, "Hello World\n", check.Commentf("Wrong reply body"))114 c.Assert(string(body), check.Equals, "Hello World\n", check.Commentf("Wrong reply body"))
115}115}
116116
117var _ = check.Suite(&goWebserverExampleSuite{})
118
119type goWebserverExampleSuite struct {
120 common.SnappySuite
121}
122
123func (s *goWebserverExampleSuite) TestGetRootPathMustPrintMessage(c *check.C) {
124 appName := "go-example-webserver"
125 common.InstallSnap(c, appName)
126 defer common.RemoveSnap(c, appName)
127
128 err := wait.ForServerOnPort(c, "tcp6", 8081)
129 c.Assert(err, check.IsNil, check.Commentf("Error waiting for server: %s", err))
130
131 resp, err := http.Get("http://localhost:8081/")
132 defer resp.Body.Close()
133 c.Assert(err, check.IsNil, check.Commentf("Error getting the http resource: %s", err))
134 c.Check(resp.Status, check.Equals, "200 OK", check.Commentf("Wrong reply status"))
135 body, err := ioutil.ReadAll(resp.Body)
136 c.Assert(err, check.IsNil, check.Commentf("Error reading the reply body: %s", err))
137 c.Assert(string(body), check.Equals, "Hello World\n", check.Commentf("Wrong reply body"))
138}
139
140var _ = check.Suite(&frameworkExampleSuite{})117var _ = check.Suite(&frameworkExampleSuite{})
141118
142type frameworkExampleSuite struct {119type frameworkExampleSuite struct {

Subscribers

People subscribed via source and target branches