Ubuntu Push Notifications

Merge lp:~pedronis/ubuntu-push/simplify-acceptance-open-mux into lp:ubuntu-push

  1. simplify-acceptance-open-mux
  2. Merge into trunk
Proposed by Samuele Pedroni
Status: Merged
Approved by: Samuele Pedroni
Approved revision: 72
Merged at revision: 69
Proposed branch: lp:~pedronis/ubuntu-push/simplify-acceptance-open-mux
Merge into: lp:ubuntu-push
Diff against target: 86 lines (+7/-13)
5 files modified
server/acceptance/acceptance.sh (+2/-5)
server/acceptance/acceptance_test.go (+1/-4)
server/api/handlers.go (+1/-1)
server/dev/server.go (+2/-2)
server/store/inmemory_test.go (+1/-1)
To merge this branch: bzr merge lp:~pedronis/ubuntu-push/simplify-acceptance-open-mux
Reviewer Review Type Date Requested Status
Diogo Baeder (community) Approve
Review via email: mp+206531@code.launchpad.net

Commit message

simplify acceptance test; don't hide that MakeHandlersMux returns a *http.ServeMux

Description of the change

* simplify acceptance test

* don't hide that MakeHandlersMux returns a *http.ServeMux

To post a comment you must log in.
Revision history for this message
Diogo Baeder (diogobaeder) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server/acceptance/acceptance.sh'
2--- server/acceptance/acceptance.sh 2014-01-23 21:14:35 +0000
3+++ server/acceptance/acceptance.sh 2014-02-14 17:14:44 +0000
4@@ -2,9 +2,6 @@
5 # can set extra build params like -race with BUILD_FLAGS envvar
6 # can set server pkg name with SERVER_PKG
7 set -ex
8-SERVER_PKG=${SERVER_PKG:-launchpad.net/ubuntu-push/server/dev}
9 go test $BUILD_FLAGS -i launchpad.net/ubuntu-push/server/acceptance
10-go build $BUILD_FLAGS -o testserver ${SERVER_PKG}
11-TESTSERVER=${PWD}/testserver
12-cd ${GOPATH}/src/launchpad.net/ubuntu-push/server/acceptance
13-go test $BUILD_FLAGS -server ${TESTSERVER} $*
14+go build $BUILD_FLAGS -o testserver launchpad.net/ubuntu-push/server/dev
15+go test $BUILD_FLAGS -server ./testserver $*
16
17=== modified file 'server/acceptance/acceptance_test.go'
18--- server/acceptance/acceptance_test.go 2014-02-11 20:36:32 +0000
19+++ server/acceptance/acceptance_test.go 2014-02-14 17:14:44 +0000
20@@ -19,7 +19,6 @@
21 import (
22 "flag"
23 "fmt"
24- "strings"
25 "testing"
26
27 . "launchpad.net/gocheck"
28@@ -30,7 +29,6 @@
29 func TestAcceptance(t *testing.T) { TestingT(t) }
30
31 var serverCmd = flag.String("server", "", "server to test")
32-var serverAuxCfg = flag.String("auxcfg", "", "auxiliary config for the server")
33
34 func testServerConfig(addr, httpAddr string) map[string]interface{} {
35 cfg := make(map[string]interface{})
36@@ -47,8 +45,7 @@
37 tmpDir := c.MkDir()
38 cfg := testServerConfig("127.0.0.1:0", "127.0.0.1:0")
39 cfgFilename := suites.WriteConfig(c, tmpDir, "config.json", cfg)
40- cfgs := append(strings.Fields(*serverAuxCfg), cfgFilename)
41- logs, killServer := suites.RunAndObserve(c, *serverCmd, cfgs...)
42+ logs, killServer := suites.RunAndObserve(c, *serverCmd, cfgFilename)
43 serverHTTPAddr := suites.ExtractListeningAddr(c, logs, suites.HTTPListeningOnPat)
44 serverURL := fmt.Sprintf("http://%s", serverHTTPAddr)
45 serverAddr := suites.ExtractListeningAddr(c, logs, suites.DevListeningOnPat)
46
47=== modified file 'server/api/handlers.go'
48--- server/api/handlers.go 2014-02-10 23:29:53 +0000
49+++ server/api/handlers.go 2014-02-14 17:14:44 +0000
50@@ -265,7 +265,7 @@
51 }
52
53 // MakeHandlersMux makes a handler that dispatches for the various API endpoints.
54-func MakeHandlersMux(store store.PendingStore, broker broker.BrokerSending, logger logger.Logger) http.Handler {
55+func MakeHandlersMux(store store.PendingStore, broker broker.BrokerSending, logger logger.Logger) *http.ServeMux {
56 mux := http.NewServeMux()
57 mux.Handle("/broadcast", &BroadcastHandler{
58 store: store,
59
60=== modified file 'server/dev/server.go'
61--- server/dev/server.go 2014-02-10 23:19:08 +0000
62+++ server/dev/server.go 2014-02-14 17:14:44 +0000
63@@ -56,8 +56,8 @@
64 broker.Start()
65 defer broker.Stop()
66 // serve the http api
67- handler := api.MakeHandlersMux(sto, broker, logger)
68- handler = api.PanicTo500Handler(handler, logger)
69+ mux := api.MakeHandlersMux(sto, broker, logger)
70+ handler := api.PanicTo500Handler(mux, logger)
71 go server.HTTPServeRunner(handler, &cfg.HTTPServeParsedConfig)()
72 // listen for device connections
73 server.DevicesRunner(func(conn net.Conn) error {
74
75=== modified file 'server/store/inmemory_test.go'
76--- server/store/inmemory_test.go 2014-02-12 16:17:25 +0000
77+++ server/store/inmemory_test.go 2014-02-14 17:14:44 +0000
78@@ -48,7 +48,7 @@
79 c.Check(res, DeepEquals, []json.RawMessage(nil))
80 }
81
82-func (s *inMemorySuite) TestAppendToChannelAndGetChannelSnapshort(c *C) {
83+func (s *inMemorySuite) TestAppendToChannelAndGetChannelSnapshot(c *C) {
84 sto := NewInMemoryPendingStore()
85
86 notification1 := json.RawMessage(`{"a":1}`)

Subscribers

People subscribed via source and target branches