Snappy

Merge lp:~elopio/snappy/backport-gocheck into lp:~snappy-dev/snappy/15.04-deprecated

  1. backport-gocheck
  2. Merge into 15.04-deprecated
Proposed by Leo Arias on 2015-08-02
Status: Merged
Approved by: Leo Arias on 2015-08-03
Approved revision: 466
Merged at revision: 465
Proposed branch: lp:~elopio/snappy/backport-gocheck
Merge into: lp:~snappy-dev/snappy/15.04-deprecated
Diff against target: 671 lines (+69/-67)
44 files modified
clickdeb/deb_test.go (+2/-2)
cmd/snappy/cmd_low_level_unpack_test.go (+1/-1)
cmd/snappy/cmd_set_test.go (+2/-2)
coreconfig/config_test.go (+2/-2)
debian/control (+1/-1)
dependencies.tsv (+1/-1)
helpers/cmp_test.go (+1/-1)
helpers/helpers_test.go (+1/-1)
helpers/touch_test.go (+1/-1)
logger/logger_test.go (+1/-1)
oauth/oauth_test.go (+1/-1)
partition/bootloader_grub_test.go (+1/-1)
partition/bootloader_uboot_test.go (+1/-1)
partition/partition_test.go (+2/-2)
partition/utils_test.go (+1/-1)
policy/policy_test.go (+3/-2)
priv/priv_test.go (+1/-1)
progress/progress_test.go (+2/-2)
release/release_test.go (+2/-2)
snappy/auth_test.go (+13/-13)
snappy/build_test.go (+1/-1)
snappy/click_test.go (+2/-2)
snappy/common_test.go (+3/-2)
snappy/config_test.go (+1/-1)
snappy/datadir_test.go (+1/-1)
snappy/dbus_test.go (+1/-1)
snappy/firstboot_test.go (+1/-1)
snappy/hashes_test.go (+1/-1)
snappy/hwaccess_test.go (+1/-1)
snappy/install_test.go (+1/-1)
snappy/oem_test.go (+1/-1)
snappy/parts_test.go (+1/-1)
snappy/purge_test.go (+1/-1)
snappy/remove_test.go (+1/-1)
snappy/rollback_test.go (+1/-1)
snappy/security_test.go (+1/-1)
snappy/set_test.go (+1/-1)
snappy/snapp_test.go (+1/-1)
snappy/sort_test.go (+1/-1)
snappy/systemimage_native_test.go (+1/-1)
snappy/systemimage_test.go (+2/-2)
snappy/timeout_test.go (+1/-1)
snappy/udev_test.go (+1/-1)
systemd/systemd_test.go (+2/-2)
To merge this branch: bzr merge lp:~elopio/snappy/backport-gocheck
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve on 2015-08-03
Federico Gimenez (community) 2015-08-02 Approve on 2015-08-03
Review via email: mp+266663@code.launchpad.net

Commit Message

Backported the change to use gopkg.in/check.v1.

Description of the Change

We need a more recent version of gocheck in order to backport the integration tests. They use some features that are not in launchpad, like TestName()

To post a comment you must log in.
Federico Gimenez (fgimenez) wrote :

LGTM, thanks

review: Approve
Sergio Schvezov (sergiusens) wrote :

This should be a problem as it doesn't affect the (delivered part of the) product itself but the testing side and this should indeed just work.

I do see some carry over gofmt things, but meh :-)

review: Approve
Leo Arias (elopio) wrote :

meh it is. Thanks to you both.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clickdeb/deb_test.go'
2--- clickdeb/deb_test.go 2015-06-03 19:12:24 +0000
3+++ clickdeb/deb_test.go 2015-08-02 12:24:18 +0000
4@@ -27,11 +27,11 @@
5 "strings"
6 "testing"
7
8- . "launchpad.net/gocheck"
9+ . "gopkg.in/check.v1"
10 "launchpad.net/snappy/helpers"
11 )
12
13-// Hook up gocheck into the "go test" runner.
14+// Hook up check.v1 into the "go test" runner.
15 func Test(t *testing.T) { TestingT(t) }
16
17 type ClickDebTestSuite struct {
18
19=== modified file 'cmd/snappy/cmd_low_level_unpack_test.go'
20--- cmd/snappy/cmd_low_level_unpack_test.go 2015-07-06 18:50:29 +0000
21+++ cmd/snappy/cmd_low_level_unpack_test.go 2015-08-02 12:24:18 +0000
22@@ -21,7 +21,7 @@
23 "os"
24 "path/filepath"
25
26- . "launchpad.net/gocheck"
27+ . "gopkg.in/check.v1"
28 )
29
30 func makeTempFile(c *C, content string) *os.File {
31
32=== modified file 'cmd/snappy/cmd_set_test.go'
33--- cmd/snappy/cmd_set_test.go 2015-03-26 09:12:58 +0000
34+++ cmd/snappy/cmd_set_test.go 2015-08-02 12:24:18 +0000
35@@ -20,10 +20,10 @@
36 import (
37 "testing"
38
39- . "launchpad.net/gocheck"
40+ . "gopkg.in/check.v1"
41 )
42
43-// Hook up gocheck into the "go test" runner
44+// Hook up check.v1 into the "go test" runner
45 func Test(t *testing.T) { TestingT(t) }
46
47 type CmdTestSuite struct {
48
49=== modified file 'coreconfig/config_test.go'
50--- coreconfig/config_test.go 2015-04-14 16:46:57 +0000
51+++ coreconfig/config_test.go 2015-08-02 12:24:18 +0000
52@@ -24,10 +24,10 @@
53 "path/filepath"
54 "testing"
55
56- . "launchpad.net/gocheck"
57+ . "gopkg.in/check.v1"
58 )
59
60-// Hook up gocheck into the "go test" runner.
61+// Hook up check.v1 into the "go test" runner.
62 func Test(t *testing.T) { TestingT(t) }
63
64 var (
65
66=== modified file 'debian/control'
67--- debian/control 2015-07-22 06:06:41 +0000
68+++ debian/control 2015-08-02 12:24:18 +0000
69@@ -8,10 +8,10 @@
70 dh-systemd,
71 fakeroot,
72 golang-ar-dev,
73+ golang-check.v1-dev,
74 golang-go,
75 golang-go-flags-dev,
76 golang-go.crypto-dev,
77- golang-gocheck-dev,
78 golang-goconfigparser-dev,
79 golang-juju-loggo-dev,
80 golang-pb-dev,
81
82=== modified file 'dependencies.tsv'
83--- dependencies.tsv 2015-07-22 12:17:49 +0000
84+++ dependencies.tsv 2015-08-02 12:24:18 +0000
85@@ -5,5 +5,5 @@
86 github.com/juju/loggo git 4c7cbce140ca070eeb59a28f4bf9507e511711f9 2015-02-26T05:51:10Z
87 github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z
88 github.com/mvo5/uboot-go git 361f6ebcbb54f389d15dc9faefa000e996ba3e37 2015-07-22T06:53:46Z
89+gopkg.in/check.v1 git 64131543e7896d5bcc6bd5a76287eb75ea96c673 2014-10-24T13:38:53Z
90 gopkg.in/yaml.v2 git 49c95bdc21843256fb6c4e0d370a05f24a0bf213 2015-02-24T22:57:58Z
91-launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 87
92
93=== modified file 'helpers/cmp_test.go'
94--- helpers/cmp_test.go 2015-04-17 06:42:44 +0000
95+++ helpers/cmp_test.go 2015-08-02 12:24:18 +0000
96@@ -23,7 +23,7 @@
97 "path/filepath"
98 "strings"
99
100- . "launchpad.net/gocheck"
101+ . "gopkg.in/check.v1"
102 )
103
104 func (ts *HTestSuite) TestCmp(c *C) {
105
106=== modified file 'helpers/helpers_test.go'
107--- helpers/helpers_test.go 2015-06-04 15:00:44 +0000
108+++ helpers/helpers_test.go 2015-08-02 12:24:18 +0000
109@@ -27,7 +27,7 @@
110 "path/filepath"
111 "testing"
112
113- . "launchpad.net/gocheck"
114+ . "gopkg.in/check.v1"
115 )
116
117 func Test(t *testing.T) { TestingT(t) }
118
119=== modified file 'helpers/touch_test.go'
120--- helpers/touch_test.go 2015-04-13 17:00:53 +0000
121+++ helpers/touch_test.go 2015-08-02 12:24:18 +0000
122@@ -22,7 +22,7 @@
123 "path/filepath"
124 "time"
125
126- . "launchpad.net/gocheck"
127+ . "gopkg.in/check.v1"
128 )
129
130 func (ts *HTestSuite) TestUpdateTimestamp(c *C) {
131
132=== modified file 'logger/logger_test.go'
133--- logger/logger_test.go 2015-03-31 14:12:52 +0000
134+++ logger/logger_test.go 2015-08-02 12:24:18 +0000
135@@ -28,7 +28,7 @@
136 "time"
137
138 "github.com/juju/loggo"
139- . "launchpad.net/gocheck"
140+ . "gopkg.in/check.v1"
141 )
142
143 func Test(t *testing.T) { TestingT(t) }
144
145=== modified file 'oauth/oauth_test.go'
146--- oauth/oauth_test.go 2015-07-06 18:59:53 +0000
147+++ oauth/oauth_test.go 2015-08-02 12:24:18 +0000
148@@ -22,7 +22,7 @@
149 import (
150 "testing"
151
152- . "launchpad.net/gocheck"
153+ . "gopkg.in/check.v1"
154 )
155
156 func Test(t *testing.T) { TestingT(t) }
157
158=== modified file 'partition/bootloader_grub_test.go'
159--- partition/bootloader_grub_test.go 2015-04-30 11:28:39 +0000
160+++ partition/bootloader_grub_test.go 2015-08-02 12:24:18 +0000
161@@ -22,7 +22,7 @@
162 "io/ioutil"
163 "os"
164
165- . "launchpad.net/gocheck"
166+ . "gopkg.in/check.v1"
167 )
168
169 func mockGrubFile(c *C, newPath string, mode os.FileMode) {
170
171=== modified file 'partition/bootloader_uboot_test.go'
172--- partition/bootloader_uboot_test.go 2015-07-23 11:58:40 +0000
173+++ partition/bootloader_uboot_test.go 2015-08-02 12:24:18 +0000
174@@ -24,7 +24,7 @@
175 "strings"
176 "time"
177
178- . "launchpad.net/gocheck"
179+ . "gopkg.in/check.v1"
180 "launchpad.net/snappy/helpers"
181
182 "github.com/mvo5/uboot-go/uenv"
183
184=== modified file 'partition/partition_test.go'
185--- partition/partition_test.go 2015-07-22 06:06:41 +0000
186+++ partition/partition_test.go 2015-08-02 12:24:18 +0000
187@@ -25,10 +25,10 @@
188 "strings"
189 "testing"
190
191- . "launchpad.net/gocheck"
192+ . "gopkg.in/check.v1"
193 )
194
195-// Hook up gocheck into the "go test" runner
196+// Hook up check.v1 into the "go test" runner
197 func Test(t *testing.T) { TestingT(t) }
198
199 // partition specific testsuite
200
201=== modified file 'partition/utils_test.go'
202--- partition/utils_test.go 2015-03-26 09:12:58 +0000
203+++ partition/utils_test.go 2015-08-02 12:24:18 +0000
204@@ -18,7 +18,7 @@
205 package partition
206
207 import (
208- . "launchpad.net/gocheck"
209+ . "gopkg.in/check.v1"
210 )
211
212 type UtilsTestSuite struct {
213
214=== modified file 'policy/policy_test.go'
215--- policy/policy_test.go 2015-04-17 06:42:44 +0000
216+++ policy/policy_test.go 2015-08-02 12:24:18 +0000
217@@ -24,11 +24,12 @@
218 "path/filepath"
219 "testing"
220
221- . "launchpad.net/gocheck"
222 "sort"
223+
224+ . "gopkg.in/check.v1"
225 )
226
227-// Hook up gocheck into the "go test" runner.
228+// Hook up check.v1 into the "go test" runner.
229 func Test(t *testing.T) { TestingT(t) }
230
231 type policySuite struct {
232
233=== modified file 'priv/priv_test.go'
234--- priv/priv_test.go 2015-03-26 09:12:58 +0000
235+++ priv/priv_test.go 2015-08-02 12:24:18 +0000
236@@ -23,7 +23,7 @@
237 "path/filepath"
238 "testing"
239
240- . "launchpad.net/gocheck"
241+ . "gopkg.in/check.v1"
242 )
243
244 func Test(t *testing.T) { TestingT(t) }
245
246=== modified file 'progress/progress_test.go'
247--- progress/progress_test.go 2015-05-29 13:41:55 +0000
248+++ progress/progress_test.go 2015-08-02 12:24:18 +0000
249@@ -23,10 +23,10 @@
250 "os"
251 "testing"
252
253- . "launchpad.net/gocheck"
254+ . "gopkg.in/check.v1"
255 )
256
257-// Hook up gocheck into the "go test" runner
258+// Hook up check.v1 into the "go test" runner
259 func Test(t *testing.T) { TestingT(t) }
260
261 type ProgressTestSuite struct {
262
263=== modified file 'release/release_test.go'
264--- release/release_test.go 2015-04-18 19:10:25 +0000
265+++ release/release_test.go 2015-08-02 12:24:18 +0000
266@@ -24,10 +24,10 @@
267 "path/filepath"
268 "testing"
269
270- . "launchpad.net/gocheck"
271+ . "gopkg.in/check.v1"
272 )
273
274-// Hook up gocheck into the "go test" runner
275+// Hook up check.v1 into the "go test" runner
276 func Test(t *testing.T) { TestingT(t) }
277
278 type ReleaseTestSuite struct {
279
280=== modified file 'snappy/auth_test.go'
281--- snappy/auth_test.go 2015-07-06 15:35:48 +0000
282+++ snappy/auth_test.go 2015-08-02 12:24:18 +0000
283@@ -28,14 +28,14 @@
284 "launchpad.net/snappy/helpers"
285 "launchpad.net/snappy/oauth"
286
287- . "launchpad.net/gocheck"
288+ . "gopkg.in/check.v1"
289 )
290
291 const mockStoreInvalidLoginCode = 401
292 const mockStoreInvalidLogin = `
293 {
294- "message": "Provided email/password is not correct.",
295- "code": "INVALID_CREDENTIALS",
296+ "message": "Provided email/password is not correct.",
297+ "code": "INVALID_CREDENTIALS",
298 "extra": {}
299 }
300 `
301@@ -43,22 +43,22 @@
302 const mockStoreNeeds2faHTTPCode = 401
303 const mockStoreNeeds2fa = `
304 {
305- "message": "2-factor authentication required.",
306- "code": "TWOFACTOR_REQUIRED",
307+ "message": "2-factor authentication required.",
308+ "code": "TWOFACTOR_REQUIRED",
309 "extra": {}
310 }
311 `
312
313 const mockStoreReturnToken = `
314 {
315- "openid": "the-open-id-string-that-is-also-the-consumer-key-in-our-store",
316- "token_name": "some-token-name",
317- "date_updated": "2015-02-27T15:00:55.062",
318- "token_key": "the-token-key",
319- "consumer_secret": "the-consumer-secret",
320- "href": "/api/v2/tokens/oauth/something",
321- "date_created": "2015-02-27T14:54:30.863",
322- "consumer_key": "the-consumer-key",
323+ "openid": "the-open-id-string-that-is-also-the-consumer-key-in-our-store",
324+ "token_name": "some-token-name",
325+ "date_updated": "2015-02-27T15:00:55.062",
326+ "token_key": "the-token-key",
327+ "consumer_secret": "the-consumer-secret",
328+ "href": "/api/v2/tokens/oauth/something",
329+ "date_created": "2015-02-27T14:54:30.863",
330+ "consumer_key": "the-consumer-key",
331 "token_secret": "the-token-secret"
332 }
333 `
334
335=== modified file 'snappy/build_test.go'
336--- snappy/build_test.go 2015-05-07 08:28:03 +0000
337+++ snappy/build_test.go 2015-08-02 12:24:18 +0000
338@@ -24,7 +24,7 @@
339 "path/filepath"
340 "strings"
341
342- . "launchpad.net/gocheck"
343+ . "gopkg.in/check.v1"
344 )
345
346 func makeFakeDuCommand(c *C) string {
347
348=== modified file 'snappy/click_test.go'
349--- snappy/click_test.go 2015-07-06 15:33:44 +0000
350+++ snappy/click_test.go 2015-08-02 12:24:18 +0000
351@@ -28,7 +28,7 @@
352 "strings"
353
354 "github.com/mvo5/goconfigparser"
355- . "launchpad.net/gocheck"
356+ . "gopkg.in/check.v1"
357
358 "launchpad.net/snappy/clickdeb"
359 "launchpad.net/snappy/helpers"
360@@ -1118,7 +1118,7 @@
361 bins := []string{"hello", "goodbye", "missya"}
362 for i := range verbs {
363 expected := fmt.Sprintf("Exec%s=/usr/bin/ubuntu-core-launcher hello-app.%s %s_svc1_1.10 %s/bin/%s", verbs[i], testNamespace, helloAppComposedName, baseDirWithoutRootPrefix, bins[i])
364- c.Check(string(content), Matches, "(?ms).*^"+regexp.QuoteMeta(expected)) // gocheck adds ^ and $ around the regexp provided
365+ c.Check(string(content), Matches, "(?ms).*^"+regexp.QuoteMeta(expected)) // check.v1 adds ^ and $ around the regexp provided
366 }
367 }
368
369
370=== modified file 'snappy/common_test.go'
371--- snappy/common_test.go 2015-04-30 16:56:15 +0000
372+++ snappy/common_test.go 2015-08-02 12:24:18 +0000
373@@ -26,9 +26,10 @@
374
375 "launchpad.net/snappy/helpers"
376
377+ "strings"
378+
379+ . "gopkg.in/check.v1"
380 "gopkg.in/yaml.v2"
381- . "launchpad.net/gocheck"
382- "strings"
383 )
384
385 const (
386
387=== modified file 'snappy/config_test.go'
388--- snappy/config_test.go 2015-04-17 20:32:02 +0000
389+++ snappy/config_test.go 2015-08-02 12:24:18 +0000
390@@ -23,7 +23,7 @@
391 "os"
392 "path/filepath"
393
394- . "launchpad.net/gocheck"
395+ . "gopkg.in/check.v1"
396 )
397
398 const configPassthroughScript = `#!/bin/sh
399
400=== modified file 'snappy/datadir_test.go'
401--- snappy/datadir_test.go 2015-04-20 13:01:02 +0000
402+++ snappy/datadir_test.go 2015-08-02 12:24:18 +0000
403@@ -22,7 +22,7 @@
404 "path/filepath"
405 "strings"
406
407- . "launchpad.net/gocheck"
408+ . "gopkg.in/check.v1"
409 )
410
411 type DataDirSuite struct{}
412
413=== modified file 'snappy/dbus_test.go'
414--- snappy/dbus_test.go 2015-04-19 01:24:03 +0000
415+++ snappy/dbus_test.go 2015-08-02 12:24:18 +0000
416@@ -1,7 +1,7 @@
417 package snappy
418
419 import (
420- . "launchpad.net/gocheck"
421+ . "gopkg.in/check.v1"
422 )
423
424 // systemd's testsuite
425
426=== modified file 'snappy/firstboot_test.go'
427--- snappy/firstboot_test.go 2015-04-14 16:46:57 +0000
428+++ snappy/firstboot_test.go 2015-08-02 12:24:18 +0000
429@@ -22,7 +22,7 @@
430 "os"
431 "path/filepath"
432
433- . "launchpad.net/gocheck"
434+ . "gopkg.in/check.v1"
435 )
436
437 type fakePart struct {
438
439=== modified file 'snappy/hashes_test.go'
440--- snappy/hashes_test.go 2015-03-31 14:12:52 +0000
441+++ snappy/hashes_test.go 2015-08-02 12:24:18 +0000
442@@ -24,7 +24,7 @@
443
444 "gopkg.in/yaml.v2"
445
446- . "launchpad.net/gocheck"
447+ . "gopkg.in/check.v1"
448 )
449
450 var fileHashYaml = `name: foo
451
452=== modified file 'snappy/hwaccess_test.go'
453--- snappy/hwaccess_test.go 2015-05-01 12:32:42 +0000
454+++ snappy/hwaccess_test.go 2015-08-02 12:24:18 +0000
455@@ -23,7 +23,7 @@
456
457 "launchpad.net/snappy/helpers"
458
459- . "launchpad.net/gocheck"
460+ . "gopkg.in/check.v1"
461 )
462
463 func mockRegenerateAppArmorRules() *bool {
464
465=== modified file 'snappy/install_test.go'
466--- snappy/install_test.go 2015-04-17 20:54:23 +0000
467+++ snappy/install_test.go 2015-08-02 12:24:18 +0000
468@@ -26,7 +26,7 @@
469 "os"
470 "path/filepath"
471
472- . "launchpad.net/gocheck"
473+ . "gopkg.in/check.v1"
474 "launchpad.net/snappy/helpers"
475 "launchpad.net/snappy/progress"
476 )
477
478=== modified file 'snappy/oem_test.go'
479--- snappy/oem_test.go 2015-04-22 12:55:07 +0000
480+++ snappy/oem_test.go 2015-08-02 12:24:18 +0000
481@@ -26,7 +26,7 @@
482
483 "launchpad.net/snappy/helpers"
484
485- . "launchpad.net/gocheck"
486+ . "gopkg.in/check.v1"
487 )
488
489 type OemSuite struct {
490
491=== modified file 'snappy/parts_test.go'
492--- snappy/parts_test.go 2015-04-21 12:05:22 +0000
493+++ snappy/parts_test.go 2015-08-02 12:24:18 +0000
494@@ -22,7 +22,7 @@
495 "os"
496 "path/filepath"
497
498- . "launchpad.net/gocheck"
499+ . "gopkg.in/check.v1"
500
501 "launchpad.net/snappy/progress"
502 )
503
504=== modified file 'snappy/purge_test.go'
505--- snappy/purge_test.go 2015-04-20 19:26:04 +0000
506+++ snappy/purge_test.go 2015-08-02 12:24:18 +0000
507@@ -23,7 +23,7 @@
508 "os"
509 "path/filepath"
510
511- . "launchpad.net/gocheck"
512+ . "gopkg.in/check.v1"
513
514 "launchpad.net/snappy/helpers"
515 "launchpad.net/snappy/systemd"
516
517=== modified file 'snappy/remove_test.go'
518--- snappy/remove_test.go 2015-04-15 13:17:22 +0000
519+++ snappy/remove_test.go 2015-08-02 12:24:18 +0000
520@@ -18,7 +18,7 @@
521 package snappy
522
523 import (
524- . "launchpad.net/gocheck"
525+ . "gopkg.in/check.v1"
526 "launchpad.net/snappy/progress"
527 )
528
529
530=== modified file 'snappy/rollback_test.go'
531--- snappy/rollback_test.go 2015-04-30 16:56:15 +0000
532+++ snappy/rollback_test.go 2015-08-02 12:24:18 +0000
533@@ -18,7 +18,7 @@
534 package snappy
535
536 import (
537- . "launchpad.net/gocheck"
538+ . "gopkg.in/check.v1"
539 )
540
541 func (s *SnapTestSuite) TestRollbackWithVersion(c *C) {
542
543=== modified file 'snappy/security_test.go'
544--- snappy/security_test.go 2015-07-06 19:56:46 +0000
545+++ snappy/security_test.go 2015-08-02 12:24:18 +0000
546@@ -5,7 +5,7 @@
547 "os"
548 "path/filepath"
549
550- . "launchpad.net/gocheck"
551+ . "gopkg.in/check.v1"
552 )
553
554 type SecurityTestSuite struct {
555
556=== modified file 'snappy/set_test.go'
557--- snappy/set_test.go 2015-04-30 16:56:15 +0000
558+++ snappy/set_test.go 2015-08-02 12:24:18 +0000
559@@ -22,7 +22,7 @@
560 "path/filepath"
561 "strings"
562
563- . "launchpad.net/gocheck"
564+ . "gopkg.in/check.v1"
565
566 "launchpad.net/snappy/progress"
567 )
568
569=== modified file 'snappy/snapp_test.go'
570--- snappy/snapp_test.go 2015-07-07 02:35:22 +0000
571+++ snappy/snapp_test.go 2015-08-02 12:24:18 +0000
572@@ -34,7 +34,7 @@
573 "launchpad.net/snappy/release"
574 "launchpad.net/snappy/systemd"
575
576- . "launchpad.net/gocheck"
577+ . "gopkg.in/check.v1"
578 )
579
580 type SnapTestSuite struct {
581
582=== modified file 'snappy/sort_test.go'
583--- snappy/sort_test.go 2015-03-26 09:12:58 +0000
584+++ snappy/sort_test.go 2015-08-02 12:24:18 +0000
585@@ -20,7 +20,7 @@
586 import (
587 "sort"
588
589- . "launchpad.net/gocheck"
590+ . "gopkg.in/check.v1"
591 )
592
593 type SortTestSuite struct {
594
595=== modified file 'snappy/systemimage_native_test.go'
596--- snappy/systemimage_native_test.go 2015-03-26 09:12:58 +0000
597+++ snappy/systemimage_native_test.go 2015-08-02 12:24:18 +0000
598@@ -25,7 +25,7 @@
599 "path/filepath"
600 "time"
601
602- . "launchpad.net/gocheck"
603+ . "gopkg.in/check.v1"
604 )
605
606 /* acquired via:
607
608=== modified file 'snappy/systemimage_test.go'
609--- snappy/systemimage_test.go 2015-07-15 07:37:44 +0000
610+++ snappy/systemimage_test.go 2015-08-02 12:24:18 +0000
611@@ -28,10 +28,10 @@
612
613 partition "launchpad.net/snappy/partition"
614
615- . "launchpad.net/gocheck"
616+ . "gopkg.in/check.v1"
617 )
618
619-// Hook up gocheck into the "go test" runner
620+// Hook up check.v1 into the "go test" runner
621 func Test(t *testing.T) { TestingT(t) }
622
623 type SITestSuite struct {
624
625=== modified file 'snappy/timeout_test.go'
626--- snappy/timeout_test.go 2015-04-13 22:20:58 +0000
627+++ snappy/timeout_test.go 2015-08-02 12:24:18 +0000
628@@ -21,7 +21,7 @@
629 "encoding/json"
630 "time"
631
632- . "launchpad.net/gocheck"
633+ . "gopkg.in/check.v1"
634 )
635
636 func (s *SnapTestSuite) TestTimeoutMarshal(c *C) {
637
638=== modified file 'snappy/udev_test.go'
639--- snappy/udev_test.go 2015-04-20 12:50:45 +0000
640+++ snappy/udev_test.go 2015-08-02 12:24:18 +0000
641@@ -18,7 +18,7 @@
642 package snappy
643
644 import (
645- . "launchpad.net/gocheck"
646+ . "gopkg.in/check.v1"
647 )
648
649 func (s *SnapTestSuite) TestGetUdevPartName(c *C) {
650
651=== modified file 'systemd/systemd_test.go'
652--- systemd/systemd_test.go 2015-07-06 15:33:44 +0000
653+++ systemd/systemd_test.go 2015-08-02 12:24:18 +0000
654@@ -24,7 +24,7 @@
655 "testing"
656 "time"
657
658- . "launchpad.net/gocheck"
659+ . "gopkg.in/check.v1"
660
661 "launchpad.net/snappy/helpers"
662 )
663@@ -37,7 +37,7 @@
664 tr.msgs = append(tr.msgs, msg)
665 }
666
667-// Hook up gocheck into the "go test" runner
668+// Hook up check.v1 into the "go test" runner
669 func Test(t *testing.T) { TestingT(t) }
670
671 // systemd's testsuite

Subscribers

People subscribed via source and target branches

to all changes: