Ubuntu Push Notifications

Merge lp:~pedronis/ubuntu-push/some-imports-reorg into lp:ubuntu-push

  1. some-imports-reorg
  2. Merge into trunk
Proposed by Samuele Pedroni
Status: Merged
Approved by: Samuele Pedroni
Approved revision: 62
Merged at revision: 59
Proposed branch: lp:~pedronis/ubuntu-push/some-imports-reorg
Merge into: lp:ubuntu-push
Diff against target: 683 lines (+105/-60)
37 files modified
config/config_test.go (+2/-1)
logger/logger_test.go (+2/-1)
protocol/messages_test.go (+2/-1)
protocol/protocol_test.go (+2/-1)
server/acceptance/acceptance_test.go (+6/-4)
server/acceptance/acceptanceclient.go (+2/-1)
server/acceptance/cmd/acceptanceclient.go (+3/-2)
server/api/handlers.go (+2/-1)
server/api/handlers_test.go (+4/-2)
server/api/middleware.go (+2/-1)
server/api/middleware_test.go (+4/-2)
server/bootlog.go (+2/-1)
server/bootlog_test.go (+4/-2)
server/broker/broker.go (+1/-0)
server/broker/broker_test.go (+1/-0)
server/broker/exchanges.go (+1/-1)
server/broker/exchanges_test.go (+4/-3)
server/broker/exchg_impl_test.go (+1/-1)
server/broker/simple/simple.go (+2/-2)
server/broker/simple/simple_test.go (+4/-3)
server/broker/simple/suite_test.go (+1/-0)
server/broker/testsuite/suite.go (+4/-2)
server/config_test.go (+4/-2)
server/dev/server.go (+4/-3)
server/listener/listener.go (+2/-1)
server/listener/listener_test.go (+4/-2)
server/runner_devices.go (+4/-3)
server/runner_http.go (+2/-1)
server/runner_test.go (+5/-3)
server/session/session.go (+3/-2)
server/session/session_test.go (+7/-5)
server/session/tracker.go (+3/-2)
server/session/tracker_test.go (+3/-1)
server/store/inmemory_test.go (+1/-0)
server/store/store_test.go (+3/-1)
testing/condition/condition_test.go (+2/-1)
testing/helpers.go (+2/-1)
To merge this branch: bzr merge lp:~pedronis/ubuntu-push/some-imports-reorg
Reviewer Review Type Date Requested Status
Samuele Pedroni Approve
Review via email: mp+205666@code.launchpad.net

Commit message

[trivial] reorg imports in: config logger protocol server testing as: stdlib -- 3rdparty -- own

Description of the change

reorg imports in:

stdlib

3rd party

own

in config logger protocol server testing

To post a comment you must log in.
Revision history for this message
Samuele Pedroni (pedronis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config/config_test.go'
--- config/config_test.go 2014-01-21 21:35:21 +0000
+++ config/config_test.go 2014-02-10 23:28:55 +0000
@@ -19,12 +19,13 @@
19import (19import (
20 "bytes"20 "bytes"
21 "io/ioutil"21 "io/ioutil"
22 . "launchpad.net/gocheck"
23 "os"22 "os"
24 "path/filepath"23 "path/filepath"
25 "reflect"24 "reflect"
26 "testing"25 "testing"
27 "time"26 "time"
27
28 . "launchpad.net/gocheck"
28)29)
2930
30func TestConfig(t *testing.T) { TestingT(t) }31func TestConfig(t *testing.T) { TestingT(t) }
3132
=== modified file 'logger/logger_test.go'
--- logger/logger_test.go 2014-02-04 20:51:39 +0000
+++ logger/logger_test.go 2014-02-10 23:28:55 +0000
@@ -19,11 +19,12 @@
19import (19import (
20 "bytes"20 "bytes"
21 "fmt"21 "fmt"
22 . "launchpad.net/gocheck"
23 "log"22 "log"
24 "os"23 "os"
25 "runtime"24 "runtime"
26 "testing"25 "testing"
26
27 . "launchpad.net/gocheck"
27)28)
2829
29func TestLogger(t *testing.T) { TestingT(t) }30func TestLogger(t *testing.T) { TestingT(t) }
3031
=== modified file 'protocol/messages_test.go'
--- protocol/messages_test.go 2014-01-14 15:35:20 +0000
+++ protocol/messages_test.go 2014-02-10 23:28:55 +0000
@@ -19,8 +19,9 @@
19import (19import (
20 "encoding/json"20 "encoding/json"
21 "fmt"21 "fmt"
22 "strings"
23
22 . "launchpad.net/gocheck"24 . "launchpad.net/gocheck"
23 "strings"
24)25)
2526
26type messagesSuite struct{}27type messagesSuite struct{}
2728
=== modified file 'protocol/protocol_test.go'
--- protocol/protocol_test.go 2014-01-14 15:35:20 +0000
+++ protocol/protocol_test.go 2014-02-10 23:28:55 +0000
@@ -21,10 +21,11 @@
21 "encoding/json"21 "encoding/json"
22 // "fmt"22 // "fmt"
23 "io"23 "io"
24 . "launchpad.net/gocheck"
25 "net"24 "net"
26 "testing"25 "testing"
27 "time"26 "time"
27
28 . "launchpad.net/gocheck"
28)29)
2930
30func TestProtocol(t *testing.T) { TestingT(t) }31func TestProtocol(t *testing.T) { TestingT(t) }
3132
=== modified file 'server/acceptance/acceptance_test.go'
--- server/acceptance/acceptance_test.go 2014-02-04 12:26:33 +0000
+++ server/acceptance/acceptance_test.go 2014-02-10 23:28:55 +0000
@@ -23,10 +23,6 @@
23 "flag"23 "flag"
24 "fmt"24 "fmt"
25 "io/ioutil"25 "io/ioutil"
26 . "launchpad.net/gocheck"
27 "launchpad.net/ubuntu-push/protocol"
28 "launchpad.net/ubuntu-push/server/api"
29 helpers "launchpad.net/ubuntu-push/testing"
30 "net"26 "net"
31 "net/http"27 "net/http"
32 "os"28 "os"
@@ -37,6 +33,12 @@
37 "strings"33 "strings"
38 "testing"34 "testing"
39 "time"35 "time"
36
37 . "launchpad.net/gocheck"
38
39 "launchpad.net/ubuntu-push/protocol"
40 "launchpad.net/ubuntu-push/server/api"
41 helpers "launchpad.net/ubuntu-push/testing"
40)42)
4143
42func TestAcceptance(t *testing.T) { TestingT(t) }44func TestAcceptance(t *testing.T) { TestingT(t) }
4345
=== modified file 'server/acceptance/acceptanceclient.go'
--- server/acceptance/acceptanceclient.go 2014-01-15 15:54:20 +0000
+++ server/acceptance/acceptanceclient.go 2014-02-10 23:28:55 +0000
@@ -22,9 +22,10 @@
22 "encoding/json"22 "encoding/json"
23 "errors"23 "errors"
24 "fmt"24 "fmt"
25 "launchpad.net/ubuntu-push/protocol"
26 "net"25 "net"
27 "time"26 "time"
27
28 "launchpad.net/ubuntu-push/protocol"
28)29)
2930
30var wireVersionBytes = []byte{protocol.ProtocolWireVersion}31var wireVersionBytes = []byte{protocol.ProtocolWireVersion}
3132
=== modified file 'server/acceptance/cmd/acceptanceclient.go'
--- server/acceptance/cmd/acceptanceclient.go 2014-01-15 15:54:20 +0000
+++ server/acceptance/cmd/acceptanceclient.go 2014-02-10 23:28:55 +0000
@@ -19,11 +19,12 @@
1919
20import (20import (
21 "flag"21 "flag"
22 "launchpad.net/ubuntu-push/config"
23 "launchpad.net/ubuntu-push/server/acceptance"
24 "log"22 "log"
25 "os"23 "os"
26 "path/filepath"24 "path/filepath"
25
26 "launchpad.net/ubuntu-push/config"
27 "launchpad.net/ubuntu-push/server/acceptance"
27)28)
2829
29var (30var (
3031
=== modified file 'server/api/handlers.go'
--- server/api/handlers.go 2014-01-29 10:12:35 +0000
+++ server/api/handlers.go 2014-02-10 23:28:55 +0000
@@ -22,10 +22,11 @@
22 "encoding/json"22 "encoding/json"
23 "fmt"23 "fmt"
24 "io"24 "io"
25 "net/http"
26
25 "launchpad.net/ubuntu-push/logger"27 "launchpad.net/ubuntu-push/logger"
26 "launchpad.net/ubuntu-push/server/broker"28 "launchpad.net/ubuntu-push/server/broker"
27 "launchpad.net/ubuntu-push/server/store"29 "launchpad.net/ubuntu-push/server/store"
28 "net/http"
29)30)
3031
31const MaxRequestBodyBytes = 4 * 102432const MaxRequestBodyBytes = 4 * 1024
3233
=== modified file 'server/api/handlers_test.go'
--- server/api/handlers_test.go 2014-01-29 10:10:57 +0000
+++ server/api/handlers_test.go 2014-02-10 23:28:55 +0000
@@ -22,12 +22,14 @@
22 "errors"22 "errors"
23 "fmt"23 "fmt"
24 "io/ioutil"24 "io/ioutil"
25 . "launchpad.net/gocheck"
26 "launchpad.net/ubuntu-push/server/store"
27 "net/http"25 "net/http"
28 "net/http/httptest"26 "net/http/httptest"
29 "strings"27 "strings"
30 "testing"28 "testing"
29
30 . "launchpad.net/gocheck"
31
32 "launchpad.net/ubuntu-push/server/store"
31)33)
3234
33func TestHandlers(t *testing.T) { TestingT(t) }35func TestHandlers(t *testing.T) { TestingT(t) }
3436
=== modified file 'server/api/middleware.go'
--- server/api/middleware.go 2014-01-16 16:15:23 +0000
+++ server/api/middleware.go 2014-02-10 23:28:55 +0000
@@ -18,8 +18,9 @@
1818
19import (19import (
20 "fmt"20 "fmt"
21 "net/http"
22
21 "launchpad.net/ubuntu-push/logger"23 "launchpad.net/ubuntu-push/logger"
22 "net/http"
23)24)
2425
25// PanicTo500Handler wraps another handler such that panics are recovered26// PanicTo500Handler wraps another handler such that panics are recovered
2627
=== modified file 'server/api/middleware_test.go'
--- server/api/middleware_test.go 2014-02-04 22:30:56 +0000
+++ server/api/middleware_test.go 2014-02-10 23:28:55 +0000
@@ -17,10 +17,12 @@
17package api17package api
1818
19import (19import (
20 "net/http"
21 "net/http/httptest"
22
20 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
24
21 helpers "launchpad.net/ubuntu-push/testing"25 helpers "launchpad.net/ubuntu-push/testing"
22 "net/http"
23 "net/http/httptest"
24)26)
2527
26type middlewareSuite struct{}28type middlewareSuite struct{}
2729
=== modified file 'server/bootlog.go'
--- server/bootlog.go 2014-01-23 15:33:30 +0000
+++ server/bootlog.go 2014-02-10 23:28:55 +0000
@@ -17,9 +17,10 @@
17package server17package server
1818
19import (19import (
20 "launchpad.net/ubuntu-push/logger"
21 "net"20 "net"
22 "os"21 "os"
22
23 "launchpad.net/ubuntu-push/logger"
23)24)
2425
25// boot logging and hooks26// boot logging and hooks
2627
=== modified file 'server/bootlog_test.go'
--- server/bootlog_test.go 2014-02-04 22:26:04 +0000
+++ server/bootlog_test.go 2014-02-10 23:28:55 +0000
@@ -17,10 +17,12 @@
17package server17package server
1818
19import (19import (
20 "net"
21 "testing"
22
20 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
24
21 helpers "launchpad.net/ubuntu-push/testing"25 helpers "launchpad.net/ubuntu-push/testing"
22 "net"
23 "testing"
24)26)
2527
26func TestRunners(t *testing.T) { TestingT(t) }28func TestRunners(t *testing.T) { TestingT(t) }
2729
=== modified file 'server/broker/broker.go'
--- server/broker/broker.go 2014-01-31 16:36:16 +0000
+++ server/broker/broker.go 2014-02-10 23:28:55 +0000
@@ -20,6 +20,7 @@
2020
21import (21import (
22 "fmt"22 "fmt"
23
23 "launchpad.net/ubuntu-push/protocol"24 "launchpad.net/ubuntu-push/protocol"
24 "launchpad.net/ubuntu-push/server/store"25 "launchpad.net/ubuntu-push/server/store"
25)26)
2627
=== modified file 'server/broker/broker_test.go'
--- server/broker/broker_test.go 2014-01-23 20:13:22 +0000
+++ server/broker/broker_test.go 2014-02-10 23:28:55 +0000
@@ -18,6 +18,7 @@
1818
19import (19import (
20 "fmt"20 "fmt"
21
21 . "launchpad.net/gocheck"22 . "launchpad.net/gocheck"
22)23)
2324
2425
=== modified file 'server/broker/exchanges.go'
--- server/broker/exchanges.go 2014-02-04 12:26:33 +0000
+++ server/broker/exchanges.go 2014-02-10 23:28:55 +0000
@@ -18,9 +18,9 @@
1818
19import (19import (
20 "encoding/json"20 "encoding/json"
21
21 "launchpad.net/ubuntu-push/protocol"22 "launchpad.net/ubuntu-push/protocol"
22 "launchpad.net/ubuntu-push/server/store"23 "launchpad.net/ubuntu-push/server/store"
23 // "log"
24)24)
2525
26// Exchanges26// Exchanges
2727
=== modified file 'server/broker/exchanges_test.go'
--- server/broker/exchanges_test.go 2014-01-31 16:36:16 +0000
+++ server/broker/exchanges_test.go 2014-02-10 23:28:55 +0000
@@ -18,15 +18,16 @@
1818
19import (19import (
20 "encoding/json"20 "encoding/json"
21 stdtesting "testing"
22
21 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
24
22 "launchpad.net/ubuntu-push/server/broker"25 "launchpad.net/ubuntu-push/server/broker"
23 "launchpad.net/ubuntu-push/server/broker/testing"26 "launchpad.net/ubuntu-push/server/broker/testing"
24 "launchpad.net/ubuntu-push/server/store"27 "launchpad.net/ubuntu-push/server/store"
25 // "log"
26 gotesting "testing"
27)28)
2829
29func TestBroker(t *gotesting.T) { TestingT(t) }30func TestBroker(t *stdtesting.T) { TestingT(t) }
3031
31type exchangesSuite struct{}32type exchangesSuite struct{}
3233
3334
=== modified file 'server/broker/exchg_impl_test.go'
--- server/broker/exchg_impl_test.go 2014-02-04 12:26:33 +0000
+++ server/broker/exchg_impl_test.go 2014-02-10 23:28:55 +0000
@@ -18,8 +18,8 @@
1818
19import (19import (
20 "encoding/json"20 "encoding/json"
21
21 . "launchpad.net/gocheck"22 . "launchpad.net/gocheck"
22 // "log"
23)23)
2424
25type exchangesImplSuite struct{}25type exchangesImplSuite struct{}
2626
=== modified file 'server/broker/simple/simple.go'
--- server/broker/simple/simple.go 2014-01-23 20:13:22 +0000
+++ server/broker/simple/simple.go 2014-02-10 23:28:55 +0000
@@ -18,12 +18,12 @@
18package simple18package simple
1919
20import (20import (
21 "sync"
22
21 "launchpad.net/ubuntu-push/logger"23 "launchpad.net/ubuntu-push/logger"
22 "launchpad.net/ubuntu-push/protocol"24 "launchpad.net/ubuntu-push/protocol"
23 "launchpad.net/ubuntu-push/server/broker"25 "launchpad.net/ubuntu-push/server/broker"
24 "launchpad.net/ubuntu-push/server/store"26 "launchpad.net/ubuntu-push/server/store"
25 // "log"
26 "sync"
27)27)
2828
29// SimpleBroker implements broker.Broker/BrokerSending for everything in just one process.29// SimpleBroker implements broker.Broker/BrokerSending for everything in just one process.
3030
=== modified file 'server/broker/simple/simple_test.go'
--- server/broker/simple/simple_test.go 2014-01-23 20:13:22 +0000
+++ server/broker/simple/simple_test.go 2014-02-10 23:28:55 +0000
@@ -18,15 +18,16 @@
1818
19import (19import (
20 "encoding/json"20 "encoding/json"
21 stdtesting "testing"
22
21 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
24
22 "launchpad.net/ubuntu-push/server/broker"25 "launchpad.net/ubuntu-push/server/broker"
23 "launchpad.net/ubuntu-push/server/broker/testing"26 "launchpad.net/ubuntu-push/server/broker/testing"
24 "launchpad.net/ubuntu-push/server/store"27 "launchpad.net/ubuntu-push/server/store"
25 // "log"
26 gotesting "testing"
27)28)
2829
29func TestSimple(t *gotesting.T) { TestingT(t) }30func TestSimple(t *stdtesting.T) { TestingT(t) }
3031
31type simpleSuite struct{}32type simpleSuite struct{}
3233
3334
=== modified file 'server/broker/simple/suite_test.go'
--- server/broker/simple/suite_test.go 2014-02-04 21:35:11 +0000
+++ server/broker/simple/suite_test.go 2014-02-10 23:28:55 +0000
@@ -18,6 +18,7 @@
1818
19import (19import (
20 . "launchpad.net/gocheck"20 . "launchpad.net/gocheck"
21
21 "launchpad.net/ubuntu-push/logger"22 "launchpad.net/ubuntu-push/logger"
22 "launchpad.net/ubuntu-push/server/broker"23 "launchpad.net/ubuntu-push/server/broker"
23 "launchpad.net/ubuntu-push/server/broker/testsuite"24 "launchpad.net/ubuntu-push/server/broker/testsuite"
2425
=== modified file 'server/broker/testsuite/suite.go'
--- server/broker/testsuite/suite.go 2014-02-04 22:30:42 +0000
+++ server/broker/testsuite/suite.go 2014-02-10 23:28:55 +0000
@@ -20,15 +20,17 @@
20import (20import (
21 "encoding/json"21 "encoding/json"
22 "errors"22 "errors"
23 // "log"
24 "time"
25
23 . "launchpad.net/gocheck"26 . "launchpad.net/gocheck"
27
24 "launchpad.net/ubuntu-push/logger"28 "launchpad.net/ubuntu-push/logger"
25 "launchpad.net/ubuntu-push/protocol"29 "launchpad.net/ubuntu-push/protocol"
26 "launchpad.net/ubuntu-push/server/broker"30 "launchpad.net/ubuntu-push/server/broker"
27 "launchpad.net/ubuntu-push/server/broker/testing"31 "launchpad.net/ubuntu-push/server/broker/testing"
28 "launchpad.net/ubuntu-push/server/store"32 "launchpad.net/ubuntu-push/server/store"
29 helpers "launchpad.net/ubuntu-push/testing"33 helpers "launchpad.net/ubuntu-push/testing"
30 // "log"
31 "time"
32)34)
3335
34// The expected interface for tested brokers.36// The expected interface for tested brokers.
3537
=== modified file 'server/config_test.go'
--- server/config_test.go 2014-01-23 15:33:30 +0000
+++ server/config_test.go 2014-02-10 23:28:55 +0000
@@ -19,11 +19,13 @@
19import (19import (
20 "bytes"20 "bytes"
21 "io/ioutil"21 "io/ioutil"
22 . "launchpad.net/gocheck"
23 "launchpad.net/ubuntu-push/config"
24 "os"22 "os"
25 "path/filepath"23 "path/filepath"
26 "time"24 "time"
25
26 . "launchpad.net/gocheck"
27
28 "launchpad.net/ubuntu-push/config"
27)29)
2830
29type configSuite struct{}31type configSuite struct{}
3032
=== modified file 'server/dev/server.go'
--- server/dev/server.go 2014-01-23 18:39:10 +0000
+++ server/dev/server.go 2014-02-10 23:28:55 +0000
@@ -18,6 +18,10 @@
18package main18package main
1919
20import (20import (
21 "net"
22 "os"
23 "path/filepath"
24
21 "launchpad.net/ubuntu-push/config"25 "launchpad.net/ubuntu-push/config"
22 "launchpad.net/ubuntu-push/logger"26 "launchpad.net/ubuntu-push/logger"
23 "launchpad.net/ubuntu-push/server"27 "launchpad.net/ubuntu-push/server"
@@ -25,9 +29,6 @@
25 "launchpad.net/ubuntu-push/server/broker/simple"29 "launchpad.net/ubuntu-push/server/broker/simple"
26 "launchpad.net/ubuntu-push/server/session"30 "launchpad.net/ubuntu-push/server/session"
27 "launchpad.net/ubuntu-push/server/store"31 "launchpad.net/ubuntu-push/server/store"
28 "net"
29 "os"
30 "path/filepath"
31)32)
3233
33type configuration struct {34type configuration struct {
3435
=== modified file 'server/listener/listener.go'
--- server/listener/listener.go 2014-01-21 21:34:10 +0000
+++ server/listener/listener.go 2014-02-10 23:28:55 +0000
@@ -19,9 +19,10 @@
1919
20import (20import (
21 "crypto/tls"21 "crypto/tls"
22 "launchpad.net/ubuntu-push/logger"
23 "net"22 "net"
24 "time"23 "time"
24
25 "launchpad.net/ubuntu-push/logger"
25)26)
2627
27// A DeviceListenerConfig offers the DeviceListener configuration.28// A DeviceListenerConfig offers the DeviceListener configuration.
2829
=== modified file 'server/listener/listener_test.go'
--- server/listener/listener_test.go 2014-02-04 21:35:11 +0000
+++ server/listener/listener_test.go 2014-02-10 23:28:55 +0000
@@ -19,12 +19,14 @@
19import (19import (
20 "crypto/tls"20 "crypto/tls"
21 "crypto/x509"21 "crypto/x509"
22 . "launchpad.net/gocheck"
23 helpers "launchpad.net/ubuntu-push/testing"
24 "net"22 "net"
25 "syscall"23 "syscall"
26 "testing"24 "testing"
27 "time"25 "time"
26
27 . "launchpad.net/gocheck"
28
29 helpers "launchpad.net/ubuntu-push/testing"
28)30)
2931
30func TestListener(t *testing.T) { TestingT(t) }32func TestListener(t *testing.T) { TestingT(t) }
3133
=== modified file 'server/runner_devices.go'
--- server/runner_devices.go 2014-01-23 15:33:30 +0000
+++ server/runner_devices.go 2014-02-10 23:28:55 +0000
@@ -18,12 +18,13 @@
1818
19import (19import (
20 "fmt"20 "fmt"
21 "net"
22 "syscall"
23 "time"
24
21 "launchpad.net/ubuntu-push/config"25 "launchpad.net/ubuntu-push/config"
22 "launchpad.net/ubuntu-push/logger"26 "launchpad.net/ubuntu-push/logger"
23 "launchpad.net/ubuntu-push/server/listener"27 "launchpad.net/ubuntu-push/server/listener"
24 "net"
25 "syscall"
26 "time"
27)28)
2829
29// A DevicesParsedConfig holds and can be used to parse the device server config.30// A DevicesParsedConfig holds and can be used to parse the device server config.
3031
=== modified file 'server/runner_http.go'
--- server/runner_http.go 2014-01-23 15:33:30 +0000
+++ server/runner_http.go 2014-02-10 23:28:55 +0000
@@ -17,9 +17,10 @@
17package server17package server
1818
19import (19import (
20 "launchpad.net/ubuntu-push/config"
21 "net"20 "net"
22 "net/http"21 "net/http"
22
23 "launchpad.net/ubuntu-push/config"
23)24)
2425
25// A HTTPServeParsedConfig holds and can be used to parse the HTTP server config.26// A HTTPServeParsedConfig holds and can be used to parse the HTTP server config.
2627
=== modified file 'server/runner_test.go'
--- server/runner_test.go 2014-02-04 22:51:42 +0000
+++ server/runner_test.go 2014-02-10 23:28:55 +0000
@@ -19,12 +19,14 @@
19import (19import (
20 "fmt"20 "fmt"
21 "io/ioutil"21 "io/ioutil"
22 "net"
23 "net/http"
24 "time"
25
22 . "launchpad.net/gocheck"26 . "launchpad.net/gocheck"
27
23 "launchpad.net/ubuntu-push/config"28 "launchpad.net/ubuntu-push/config"
24 helpers "launchpad.net/ubuntu-push/testing"29 helpers "launchpad.net/ubuntu-push/testing"
25 "net"
26 "net/http"
27 "time"
28)30)
2931
30type runnerSuite struct {32type runnerSuite struct {
3133
=== modified file 'server/session/session.go'
--- server/session/session.go 2014-01-31 17:25:02 +0000
+++ server/session/session.go 2014-02-10 23:28:55 +0000
@@ -18,10 +18,11 @@
18package session18package session
1919
20import (20import (
21 "net"
22 "time"
23
21 "launchpad.net/ubuntu-push/protocol"24 "launchpad.net/ubuntu-push/protocol"
22 "launchpad.net/ubuntu-push/server/broker"25 "launchpad.net/ubuntu-push/server/broker"
23 "net"
24 "time"
25)26)
2627
27// SessionConfig is for carrying the session configuration.28// SessionConfig is for carrying the session configuration.
2829
=== modified file 'server/session/session_test.go'
--- server/session/session_test.go 2014-02-04 22:39:18 +0000
+++ server/session/session_test.go 2014-02-10 23:28:55 +0000
@@ -22,18 +22,20 @@
22 "errors"22 "errors"
23 "fmt"23 "fmt"
24 "io"24 "io"
25 "net"
26 "reflect"
27 stdtesting "testing"
28 "time"
29
25 . "launchpad.net/gocheck"30 . "launchpad.net/gocheck"
31
26 "launchpad.net/ubuntu-push/protocol"32 "launchpad.net/ubuntu-push/protocol"
27 "launchpad.net/ubuntu-push/server/broker"33 "launchpad.net/ubuntu-push/server/broker"
28 "launchpad.net/ubuntu-push/server/broker/testing"34 "launchpad.net/ubuntu-push/server/broker/testing"
29 helpers "launchpad.net/ubuntu-push/testing"35 helpers "launchpad.net/ubuntu-push/testing"
30 "net"
31 "reflect"
32 gotesting "testing"
33 "time"
34)36)
3537
36func TestSession(t *gotesting.T) { TestingT(t) }38func TestSession(t *stdtesting.T) { TestingT(t) }
3739
38type sessionSuite struct {40type sessionSuite struct {
39 testlog *helpers.TestLogger41 testlog *helpers.TestLogger
4042
=== modified file 'server/session/tracker.go'
--- server/session/tracker.go 2014-01-31 17:25:02 +0000
+++ server/session/tracker.go 2014-02-10 23:28:55 +0000
@@ -17,10 +17,11 @@
17package session17package session
1818
19import (19import (
20 "net"
21 "time"
22
20 "launchpad.net/ubuntu-push/logger"23 "launchpad.net/ubuntu-push/logger"
21 "launchpad.net/ubuntu-push/server/broker"24 "launchpad.net/ubuntu-push/server/broker"
22 "net"
23 "time"
24)25)
2526
26// SessionTracker logs session events.27// SessionTracker logs session events.
2728
=== modified file 'server/session/tracker_test.go'
--- server/session/tracker_test.go 2014-02-04 22:45:15 +0000
+++ server/session/tracker_test.go 2014-02-10 23:28:55 +0000
@@ -18,11 +18,13 @@
1818
19import (19import (
20 "fmt"20 "fmt"
21 "net"
22
21 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
24
22 "launchpad.net/ubuntu-push/server/broker"25 "launchpad.net/ubuntu-push/server/broker"
23 "launchpad.net/ubuntu-push/server/broker/testing"26 "launchpad.net/ubuntu-push/server/broker/testing"
24 helpers "launchpad.net/ubuntu-push/testing"27 helpers "launchpad.net/ubuntu-push/testing"
25 "net"
26)28)
2729
28type trackerSuite struct {30type trackerSuite struct {
2931
=== modified file 'server/store/inmemory_test.go'
--- server/store/inmemory_test.go 2014-01-14 15:35:20 +0000
+++ server/store/inmemory_test.go 2014-02-10 23:28:55 +0000
@@ -19,6 +19,7 @@
19import (19import (
20 "encoding/json"20 "encoding/json"
21 // "fmt"21 // "fmt"
22
22 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
23)24)
2425
2526
=== modified file 'server/store/store_test.go'
--- server/store/store_test.go 2014-01-14 15:35:20 +0000
+++ server/store/store_test.go 2014-02-10 23:28:55 +0000
@@ -18,9 +18,11 @@
1818
19import (19import (
20 // "fmt"20 // "fmt"
21 "testing"
22
21 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
24
22 "launchpad.net/ubuntu-push/protocol"25 "launchpad.net/ubuntu-push/protocol"
23 "testing"
24)26)
2527
26func TestStore(t *testing.T) { TestingT(t) }28func TestStore(t *testing.T) { TestingT(t) }
2729
=== modified file 'testing/condition/condition_test.go'
--- testing/condition/condition_test.go 2014-01-20 06:23:17 +0000
+++ testing/condition/condition_test.go 2014-02-10 23:28:55 +0000
@@ -17,8 +17,9 @@
17package condition17package condition
1818
19import (19import (
20 "testing"
21
20 "launchpad.net/gocheck" // not into . because we have our own Not22 "launchpad.net/gocheck" // not into . because we have our own Not
21 "testing"
22)23)
2324
24// hook up gocheck25// hook up gocheck
2526
=== modified file 'testing/helpers.go'
--- testing/helpers.go 2014-02-07 10:48:21 +0000
+++ testing/helpers.go 2014-02-10 23:28:55 +0000
@@ -19,12 +19,13 @@
1919
20import (20import (
21 "fmt"21 "fmt"
22 "launchpad.net/ubuntu-push/logger"
23 "os"22 "os"
24 "path/filepath"23 "path/filepath"
25 "runtime"24 "runtime"
26 "strings"25 "strings"
27 "sync"26 "sync"
27
28 "launchpad.net/ubuntu-push/logger"
28)29)
2930
30type captureHelper struct {31type captureHelper struct {

Subscribers

People subscribed via source and target branches