Snappy

Merge lp:~sergiusens/snappy/forgetGocheck into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. forgetGocheck
  2. Merge into snappy-moved-to-github
Proposed by Sergio Schvezov on 2015-06-02
Status: Merged
Approved by: Michael Vogt on 2015-06-03
Approved revision: 484
Merged at revision: 482
Proposed branch: lp:~sergiusens/snappy/forgetGocheck
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 686 lines (+64/-63)
47 files modified
README.md (+6/-5)
clickdeb/deb_test.go (+2/-2)
clickdeb/verify_test.go (+1/-1)
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/cp_linux_test.go (+1/-1)
helpers/cp_test.go (+1/-1)
helpers/helpers_test.go (+1/-1)
helpers/touch_test.go (+1/-1)
logger/logger_test.go (+2/-2)
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)
pkg/types_test.go (+2/-2)
policy/policy_test.go (+2/-2)
priv/priv_test.go (+1/-1)
progress/progress_test.go (+2/-2)
release/release_test.go (+2/-2)
snappy/auth_test.go (+1/-1)
snappy/build_test.go (+1/-1)
snappy/click_test.go (+2/-2)
snappy/common_test.go (+1/-1)
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)
systemd/systemd_test.go (+2/-2)
To merge this branch: bzr merge lp:~sergiusens/snappy/forgetGocheck
Reviewer Review Type Date Requested Status
Michael Vogt 2015-06-02 Approve on 2015-06-03
Review via email: mp+260890@code.launchpad.net

Commit Message

Replace the deprecated launchpad.net/gocheck with gopkg.in/check.v1

To post a comment you must log in.
lp:~sergiusens/snappy/forgetGocheck updated on 2015-06-02
483. By Sergio Schvezov on 2015-06-02

Update in-code documentation

484. By Sergio Schvezov on 2015-06-02

Updating README.md

Michael Vogt (mvo) wrote :

Thanks! Looks good, I especially appreciate the update to the README.md!

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches