Ubuntu Push Notifications

Merge lp:~pedronis/ubuntu-push/acceptanceclient-tweaks into lp:ubuntu-push/automatic

  1. acceptanceclient-tweaks
  2. Merge into automatic
Proposed by Samuele Pedroni
Status: Merged
Approved by: Samuele Pedroni
Approved revision: 115
Merged at revision: 114
Proposed branch: lp:~pedronis/ubuntu-push/acceptanceclient-tweaks
Merge into: lp:ubuntu-push/automatic
Prerequisite: lp:~pedronis/ubuntu-push/simple-delivery-hosts
Diff against target: 105 lines (+18/-10)
3 files modified
server/acceptance/acceptanceclient.go (+5/-4)
server/acceptance/cmd/acceptanceclient.go (+10/-3)
server/acceptance/suites/pingpong.go (+3/-3)
To merge this branch: bzr merge lp:~pedronis/ubuntu-push/acceptanceclient-tweaks
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+215179@code.launchpad.net

Commit message

tweaks to the acceptance client, don't load a cert if we are in insecure mode anyway

Description of the change

tweaks to the acceptance client, don't load a cert if we are in insecure mode anyway

To post a comment you must log in.
lp:~pedronis/ubuntu-push/acceptanceclient-tweaks updated
115. By Samuele Pedroni

improve usage message

Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server/acceptance/acceptanceclient.go'
2--- server/acceptance/acceptanceclient.go 2014-04-03 16:47:47 +0000
3+++ server/acceptance/acceptanceclient.go 2014-04-10 13:52:23 +0000
4@@ -42,7 +42,8 @@
5 CertPEMBlock []byte
6 ReportPings bool
7 Levels map[string]int64
8- Insecure bool // don't verify certs
9+ Insecure bool // don't verify certs
10+ Prefix string // prefix for events
11 // connection
12 Connection net.Conn
13 }
14@@ -105,7 +106,7 @@
15 if err != nil {
16 return err
17 }
18- events <- fmt.Sprintf("connected %v", conn.LocalAddr())
19+ events <- fmt.Sprintf("%sconnected %v", sess.Prefix, conn.LocalAddr())
20 var recv serverMsg
21 for {
22 deadAfter := pingInterval + sess.ExchangeTimeout
23@@ -122,7 +123,7 @@
24 return err
25 }
26 if sess.ReportPings {
27- events <- "Ping"
28+ events <- sess.Prefix + "ping"
29 }
30 case "broadcast":
31 conn.SetDeadline(time.Now().Add(sess.ExchangeTimeout))
32@@ -134,7 +135,7 @@
33 if err != nil {
34 return err
35 }
36- events <- fmt.Sprintf("broadcast chan:%v app:%v topLevel:%d payloads:%s", recv.ChanId, recv.AppId, recv.TopLevel, pack)
37+ events <- fmt.Sprintf("%sbroadcast chan:%v app:%v topLevel:%d payloads:%s", sess.Prefix, recv.ChanId, recv.AppId, recv.TopLevel, pack)
38 }
39 }
40 return nil
41
42=== modified file 'server/acceptance/cmd/acceptanceclient.go'
43--- server/acceptance/cmd/acceptanceclient.go 2014-04-03 16:47:47 +0000
44+++ server/acceptance/cmd/acceptanceclient.go 2014-04-10 13:52:23 +0000
45@@ -19,6 +19,7 @@
46
47 import (
48 "flag"
49+ "fmt"
50 "log"
51 "os"
52 "path/filepath"
53@@ -43,6 +44,10 @@
54 }
55
56 func main() {
57+ flag.Usage = func() {
58+ fmt.Fprintf(os.Stderr, "Usage: acceptancclient [options] <config.json> <device id>\n")
59+ flag.PrintDefaults()
60+ }
61 flag.Parse()
62 narg := flag.NArg()
63 switch {
64@@ -72,9 +77,11 @@
65 Insecure: *insecureFlag,
66 }
67 log.Printf("with: %#v", session)
68- session.CertPEMBlock, err = config.LoadFile(cfg.CertPEMFile, filepath.Dir(configFName))
69- if err != nil {
70- log.Fatalf("reading CertPEMFile: %v", err)
71+ if !*insecureFlag {
72+ session.CertPEMBlock, err = config.LoadFile(cfg.CertPEMFile, filepath.Dir(configFName))
73+ if err != nil {
74+ log.Fatalf("reading CertPEMFile: %v", err)
75+ }
76 }
77 err = session.Dial()
78 if err != nil {
79
80=== modified file 'server/acceptance/suites/pingpong.go'
81--- server/acceptance/suites/pingpong.go 2014-04-03 16:47:47 +0000
82+++ server/acceptance/suites/pingpong.go 2014-04-10 13:52:23 +0000
83@@ -56,11 +56,11 @@
84 c.Assert(connectSrv, Matches, ".*session.* connected .*")
85 c.Assert(registeredSrv, Matches, ".*session.* registered DEVA")
86 c.Assert(strings.HasSuffix(connectSrv, connectCli), Equals, true)
87- c.Assert(NextEvent(events, errCh), Equals, "Ping")
88+ c.Assert(NextEvent(events, errCh), Equals, "ping")
89 elapsedOfPing := float64(time.Since(tconnect)) / float64(500*time.Millisecond)
90 c.Check(elapsedOfPing >= 1.0, Equals, true)
91 c.Check(elapsedOfPing < 1.05, Equals, true)
92- c.Assert(NextEvent(events, errCh), Equals, "Ping")
93+ c.Assert(NextEvent(events, errCh), Equals, "ping")
94 c.Assert(NextEvent(s.ServerEvents, nil), Matches, ".*session.* ended with: EOF")
95 c.Check(len(errCh), Equals, 0)
96 }
97@@ -87,7 +87,7 @@
98 c.Assert(NextEvent(events, errCh), Matches, "connected .*")
99 c.Assert(NextEvent(s.ServerEvents, nil), Matches, ".*session.* connected .*")
100 c.Assert(NextEvent(s.ServerEvents, nil), Matches, ".*session.* registered .*")
101- c.Assert(NextEvent(events, errCh), Equals, "Ping")
102+ c.Assert(NextEvent(events, errCh), Equals, "ping")
103 c.Assert(NextEvent(s.ServerEvents, nil), Matches, `.* ended with:.*timeout`)
104 c.Check(len(errCh), Equals, 0)
105 }

Subscribers

People subscribed via source and target branches