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
Status: Merged
Approved by: Leo Arias
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
Federico Gimenez (community) Approve
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.
Revision history for this message
Federico Gimenez (fgimenez) wrote :

LGTM, thanks

review: Approve
Revision history for this message
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
Revision history for this message
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
=== modified file 'clickdeb/deb_test.go'
--- clickdeb/deb_test.go 2015-06-03 19:12:24 +0000
+++ clickdeb/deb_test.go 2015-08-02 12:24:18 +0000
@@ -27,11 +27,11 @@
27 "strings"27 "strings"
28 "testing"28 "testing"
2929
30 . "launchpad.net/gocheck"30 . "gopkg.in/check.v1"
31 "launchpad.net/snappy/helpers"31 "launchpad.net/snappy/helpers"
32)32)
3333
34// Hook up gocheck into the "go test" runner.34// Hook up check.v1 into the "go test" runner.
35func Test(t *testing.T) { TestingT(t) }35func Test(t *testing.T) { TestingT(t) }
3636
37type ClickDebTestSuite struct {37type ClickDebTestSuite struct {
3838
=== modified file 'cmd/snappy/cmd_low_level_unpack_test.go'
--- cmd/snappy/cmd_low_level_unpack_test.go 2015-07-06 18:50:29 +0000
+++ cmd/snappy/cmd_low_level_unpack_test.go 2015-08-02 12:24:18 +0000
@@ -21,7 +21,7 @@
21 "os"21 "os"
22 "path/filepath"22 "path/filepath"
2323
24 . "launchpad.net/gocheck"24 . "gopkg.in/check.v1"
25)25)
2626
27func makeTempFile(c *C, content string) *os.File {27func makeTempFile(c *C, content string) *os.File {
2828
=== modified file 'cmd/snappy/cmd_set_test.go'
--- cmd/snappy/cmd_set_test.go 2015-03-26 09:12:58 +0000
+++ cmd/snappy/cmd_set_test.go 2015-08-02 12:24:18 +0000
@@ -20,10 +20,10 @@
20import (20import (
21 "testing"21 "testing"
2222
23 . "launchpad.net/gocheck"23 . "gopkg.in/check.v1"
24)24)
2525
26// Hook up gocheck into the "go test" runner26// Hook up check.v1 into the "go test" runner
27func Test(t *testing.T) { TestingT(t) }27func Test(t *testing.T) { TestingT(t) }
2828
29type CmdTestSuite struct {29type CmdTestSuite struct {
3030
=== modified file 'coreconfig/config_test.go'
--- coreconfig/config_test.go 2015-04-14 16:46:57 +0000
+++ coreconfig/config_test.go 2015-08-02 12:24:18 +0000
@@ -24,10 +24,10 @@
24 "path/filepath"24 "path/filepath"
25 "testing"25 "testing"
2626
27 . "launchpad.net/gocheck"27 . "gopkg.in/check.v1"
28)28)
2929
30// Hook up gocheck into the "go test" runner.30// Hook up check.v1 into the "go test" runner.
31func Test(t *testing.T) { TestingT(t) }31func Test(t *testing.T) { TestingT(t) }
3232
33var (33var (
3434
=== modified file 'debian/control'
--- debian/control 2015-07-22 06:06:41 +0000
+++ debian/control 2015-08-02 12:24:18 +0000
@@ -8,10 +8,10 @@
8 dh-systemd,8 dh-systemd,
9 fakeroot,9 fakeroot,
10 golang-ar-dev,10 golang-ar-dev,
11 golang-check.v1-dev,
11 golang-go,12 golang-go,
12 golang-go-flags-dev,13 golang-go-flags-dev,
13 golang-go.crypto-dev,14 golang-go.crypto-dev,
14 golang-gocheck-dev,
15 golang-goconfigparser-dev,15 golang-goconfigparser-dev,
16 golang-juju-loggo-dev,16 golang-juju-loggo-dev,
17 golang-pb-dev,17 golang-pb-dev,
1818
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2015-07-22 12:17:49 +0000
+++ dependencies.tsv 2015-08-02 12:24:18 +0000
@@ -5,5 +5,5 @@
5github.com/juju/loggo git 4c7cbce140ca070eeb59a28f4bf9507e511711f9 2015-02-26T05:51:10Z5github.com/juju/loggo git 4c7cbce140ca070eeb59a28f4bf9507e511711f9 2015-02-26T05:51:10Z
6github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z6github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z
7github.com/mvo5/uboot-go git 361f6ebcbb54f389d15dc9faefa000e996ba3e37 2015-07-22T06:53:46Z7github.com/mvo5/uboot-go git 361f6ebcbb54f389d15dc9faefa000e996ba3e37 2015-07-22T06:53:46Z
8gopkg.in/check.v1 git 64131543e7896d5bcc6bd5a76287eb75ea96c673 2014-10-24T13:38:53Z
8gopkg.in/yaml.v2 git 49c95bdc21843256fb6c4e0d370a05f24a0bf213 2015-02-24T22:57:58Z9gopkg.in/yaml.v2 git 49c95bdc21843256fb6c4e0d370a05f24a0bf213 2015-02-24T22:57:58Z
9launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 87
1010
=== modified file 'helpers/cmp_test.go'
--- helpers/cmp_test.go 2015-04-17 06:42:44 +0000
+++ helpers/cmp_test.go 2015-08-02 12:24:18 +0000
@@ -23,7 +23,7 @@
23 "path/filepath"23 "path/filepath"
24 "strings"24 "strings"
2525
26 . "launchpad.net/gocheck"26 . "gopkg.in/check.v1"
27)27)
2828
29func (ts *HTestSuite) TestCmp(c *C) {29func (ts *HTestSuite) TestCmp(c *C) {
3030
=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go 2015-06-04 15:00:44 +0000
+++ helpers/helpers_test.go 2015-08-02 12:24:18 +0000
@@ -27,7 +27,7 @@
27 "path/filepath"27 "path/filepath"
28 "testing"28 "testing"
2929
30 . "launchpad.net/gocheck"30 . "gopkg.in/check.v1"
31)31)
3232
33func Test(t *testing.T) { TestingT(t) }33func Test(t *testing.T) { TestingT(t) }
3434
=== modified file 'helpers/touch_test.go'
--- helpers/touch_test.go 2015-04-13 17:00:53 +0000
+++ helpers/touch_test.go 2015-08-02 12:24:18 +0000
@@ -22,7 +22,7 @@
22 "path/filepath"22 "path/filepath"
23 "time"23 "time"
2424
25 . "launchpad.net/gocheck"25 . "gopkg.in/check.v1"
26)26)
2727
28func (ts *HTestSuite) TestUpdateTimestamp(c *C) {28func (ts *HTestSuite) TestUpdateTimestamp(c *C) {
2929
=== modified file 'logger/logger_test.go'
--- logger/logger_test.go 2015-03-31 14:12:52 +0000
+++ logger/logger_test.go 2015-08-02 12:24:18 +0000
@@ -28,7 +28,7 @@
28 "time"28 "time"
2929
30 "github.com/juju/loggo"30 "github.com/juju/loggo"
31 . "launchpad.net/gocheck"31 . "gopkg.in/check.v1"
32)32)
3333
34func Test(t *testing.T) { TestingT(t) }34func Test(t *testing.T) { TestingT(t) }
3535
=== modified file 'oauth/oauth_test.go'
--- oauth/oauth_test.go 2015-07-06 18:59:53 +0000
+++ oauth/oauth_test.go 2015-08-02 12:24:18 +0000
@@ -22,7 +22,7 @@
22import (22import (
23 "testing"23 "testing"
2424
25 . "launchpad.net/gocheck"25 . "gopkg.in/check.v1"
26)26)
2727
28func Test(t *testing.T) { TestingT(t) }28func Test(t *testing.T) { TestingT(t) }
2929
=== modified file 'partition/bootloader_grub_test.go'
--- partition/bootloader_grub_test.go 2015-04-30 11:28:39 +0000
+++ partition/bootloader_grub_test.go 2015-08-02 12:24:18 +0000
@@ -22,7 +22,7 @@
22 "io/ioutil"22 "io/ioutil"
23 "os"23 "os"
2424
25 . "launchpad.net/gocheck"25 . "gopkg.in/check.v1"
26)26)
2727
28func mockGrubFile(c *C, newPath string, mode os.FileMode) {28func mockGrubFile(c *C, newPath string, mode os.FileMode) {
2929
=== modified file 'partition/bootloader_uboot_test.go'
--- partition/bootloader_uboot_test.go 2015-07-23 11:58:40 +0000
+++ partition/bootloader_uboot_test.go 2015-08-02 12:24:18 +0000
@@ -24,7 +24,7 @@
24 "strings"24 "strings"
25 "time"25 "time"
2626
27 . "launchpad.net/gocheck"27 . "gopkg.in/check.v1"
28 "launchpad.net/snappy/helpers"28 "launchpad.net/snappy/helpers"
2929
30 "github.com/mvo5/uboot-go/uenv"30 "github.com/mvo5/uboot-go/uenv"
3131
=== modified file 'partition/partition_test.go'
--- partition/partition_test.go 2015-07-22 06:06:41 +0000
+++ partition/partition_test.go 2015-08-02 12:24:18 +0000
@@ -25,10 +25,10 @@
25 "strings"25 "strings"
26 "testing"26 "testing"
2727
28 . "launchpad.net/gocheck"28 . "gopkg.in/check.v1"
29)29)
3030
31// Hook up gocheck into the "go test" runner31// Hook up check.v1 into the "go test" runner
32func Test(t *testing.T) { TestingT(t) }32func Test(t *testing.T) { TestingT(t) }
3333
34// partition specific testsuite34// partition specific testsuite
3535
=== modified file 'partition/utils_test.go'
--- partition/utils_test.go 2015-03-26 09:12:58 +0000
+++ partition/utils_test.go 2015-08-02 12:24:18 +0000
@@ -18,7 +18,7 @@
18package partition18package partition
1919
20import (20import (
21 . "launchpad.net/gocheck"21 . "gopkg.in/check.v1"
22)22)
2323
24type UtilsTestSuite struct {24type UtilsTestSuite struct {
2525
=== modified file 'policy/policy_test.go'
--- policy/policy_test.go 2015-04-17 06:42:44 +0000
+++ policy/policy_test.go 2015-08-02 12:24:18 +0000
@@ -24,11 +24,12 @@
24 "path/filepath"24 "path/filepath"
25 "testing"25 "testing"
2626
27 . "launchpad.net/gocheck"
28 "sort"27 "sort"
28
29 . "gopkg.in/check.v1"
29)30)
3031
31// Hook up gocheck into the "go test" runner.32// Hook up check.v1 into the "go test" runner.
32func Test(t *testing.T) { TestingT(t) }33func Test(t *testing.T) { TestingT(t) }
3334
34type policySuite struct {35type policySuite struct {
3536
=== modified file 'priv/priv_test.go'
--- priv/priv_test.go 2015-03-26 09:12:58 +0000
+++ priv/priv_test.go 2015-08-02 12:24:18 +0000
@@ -23,7 +23,7 @@
23 "path/filepath"23 "path/filepath"
24 "testing"24 "testing"
2525
26 . "launchpad.net/gocheck"26 . "gopkg.in/check.v1"
27)27)
2828
29func Test(t *testing.T) { TestingT(t) }29func Test(t *testing.T) { TestingT(t) }
3030
=== modified file 'progress/progress_test.go'
--- progress/progress_test.go 2015-05-29 13:41:55 +0000
+++ progress/progress_test.go 2015-08-02 12:24:18 +0000
@@ -23,10 +23,10 @@
23 "os"23 "os"
24 "testing"24 "testing"
2525
26 . "launchpad.net/gocheck"26 . "gopkg.in/check.v1"
27)27)
2828
29// Hook up gocheck into the "go test" runner29// Hook up check.v1 into the "go test" runner
30func Test(t *testing.T) { TestingT(t) }30func Test(t *testing.T) { TestingT(t) }
3131
32type ProgressTestSuite struct {32type ProgressTestSuite struct {
3333
=== modified file 'release/release_test.go'
--- release/release_test.go 2015-04-18 19:10:25 +0000
+++ release/release_test.go 2015-08-02 12:24:18 +0000
@@ -24,10 +24,10 @@
24 "path/filepath"24 "path/filepath"
25 "testing"25 "testing"
2626
27 . "launchpad.net/gocheck"27 . "gopkg.in/check.v1"
28)28)
2929
30// Hook up gocheck into the "go test" runner30// Hook up check.v1 into the "go test" runner
31func Test(t *testing.T) { TestingT(t) }31func Test(t *testing.T) { TestingT(t) }
3232
33type ReleaseTestSuite struct {33type ReleaseTestSuite struct {
3434
=== modified file 'snappy/auth_test.go'
--- snappy/auth_test.go 2015-07-06 15:35:48 +0000
+++ snappy/auth_test.go 2015-08-02 12:24:18 +0000
@@ -28,14 +28,14 @@
28 "launchpad.net/snappy/helpers"28 "launchpad.net/snappy/helpers"
29 "launchpad.net/snappy/oauth"29 "launchpad.net/snappy/oauth"
3030
31 . "launchpad.net/gocheck"31 . "gopkg.in/check.v1"
32)32)
3333
34const mockStoreInvalidLoginCode = 40134const mockStoreInvalidLoginCode = 401
35const mockStoreInvalidLogin = `35const mockStoreInvalidLogin = `
36{36{
37 "message": "Provided email/password is not correct.", 37 "message": "Provided email/password is not correct.",
38 "code": "INVALID_CREDENTIALS", 38 "code": "INVALID_CREDENTIALS",
39 "extra": {}39 "extra": {}
40}40}
41`41`
@@ -43,22 +43,22 @@
43const mockStoreNeeds2faHTTPCode = 40143const mockStoreNeeds2faHTTPCode = 401
44const mockStoreNeeds2fa = `44const mockStoreNeeds2fa = `
45{45{
46 "message": "2-factor authentication required.", 46 "message": "2-factor authentication required.",
47 "code": "TWOFACTOR_REQUIRED", 47 "code": "TWOFACTOR_REQUIRED",
48 "extra": {}48 "extra": {}
49}49}
50`50`
5151
52const mockStoreReturnToken = `52const mockStoreReturnToken = `
53{53{
54 "openid": "the-open-id-string-that-is-also-the-consumer-key-in-our-store", 54 "openid": "the-open-id-string-that-is-also-the-consumer-key-in-our-store",
55 "token_name": "some-token-name", 55 "token_name": "some-token-name",
56 "date_updated": "2015-02-27T15:00:55.062", 56 "date_updated": "2015-02-27T15:00:55.062",
57 "token_key": "the-token-key", 57 "token_key": "the-token-key",
58 "consumer_secret": "the-consumer-secret", 58 "consumer_secret": "the-consumer-secret",
59 "href": "/api/v2/tokens/oauth/something", 59 "href": "/api/v2/tokens/oauth/something",
60 "date_created": "2015-02-27T14:54:30.863", 60 "date_created": "2015-02-27T14:54:30.863",
61 "consumer_key": "the-consumer-key", 61 "consumer_key": "the-consumer-key",
62 "token_secret": "the-token-secret"62 "token_secret": "the-token-secret"
63}63}
64`64`
6565
=== modified file 'snappy/build_test.go'
--- snappy/build_test.go 2015-05-07 08:28:03 +0000
+++ snappy/build_test.go 2015-08-02 12:24:18 +0000
@@ -24,7 +24,7 @@
24 "path/filepath"24 "path/filepath"
25 "strings"25 "strings"
2626
27 . "launchpad.net/gocheck"27 . "gopkg.in/check.v1"
28)28)
2929
30func makeFakeDuCommand(c *C) string {30func makeFakeDuCommand(c *C) string {
3131
=== modified file 'snappy/click_test.go'
--- snappy/click_test.go 2015-07-06 15:33:44 +0000
+++ snappy/click_test.go 2015-08-02 12:24:18 +0000
@@ -28,7 +28,7 @@
28 "strings"28 "strings"
2929
30 "github.com/mvo5/goconfigparser"30 "github.com/mvo5/goconfigparser"
31 . "launchpad.net/gocheck"31 . "gopkg.in/check.v1"
3232
33 "launchpad.net/snappy/clickdeb"33 "launchpad.net/snappy/clickdeb"
34 "launchpad.net/snappy/helpers"34 "launchpad.net/snappy/helpers"
@@ -1118,7 +1118,7 @@
1118 bins := []string{"hello", "goodbye", "missya"}1118 bins := []string{"hello", "goodbye", "missya"}
1119 for i := range verbs {1119 for i := range verbs {
1120 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])1120 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])
1121 c.Check(string(content), Matches, "(?ms).*^"+regexp.QuoteMeta(expected)) // gocheck adds ^ and $ around the regexp provided1121 c.Check(string(content), Matches, "(?ms).*^"+regexp.QuoteMeta(expected)) // check.v1 adds ^ and $ around the regexp provided
1122 }1122 }
1123}1123}
11241124
11251125
=== modified file 'snappy/common_test.go'
--- snappy/common_test.go 2015-04-30 16:56:15 +0000
+++ snappy/common_test.go 2015-08-02 12:24:18 +0000
@@ -26,9 +26,10 @@
2626
27 "launchpad.net/snappy/helpers"27 "launchpad.net/snappy/helpers"
2828
29 "strings"
30
31 . "gopkg.in/check.v1"
29 "gopkg.in/yaml.v2"32 "gopkg.in/yaml.v2"
30 . "launchpad.net/gocheck"
31 "strings"
32)33)
3334
34const (35const (
3536
=== modified file 'snappy/config_test.go'
--- snappy/config_test.go 2015-04-17 20:32:02 +0000
+++ snappy/config_test.go 2015-08-02 12:24:18 +0000
@@ -23,7 +23,7 @@
23 "os"23 "os"
24 "path/filepath"24 "path/filepath"
2525
26 . "launchpad.net/gocheck"26 . "gopkg.in/check.v1"
27)27)
2828
29const configPassthroughScript = `#!/bin/sh29const configPassthroughScript = `#!/bin/sh
3030
=== modified file 'snappy/datadir_test.go'
--- snappy/datadir_test.go 2015-04-20 13:01:02 +0000
+++ snappy/datadir_test.go 2015-08-02 12:24:18 +0000
@@ -22,7 +22,7 @@
22 "path/filepath"22 "path/filepath"
23 "strings"23 "strings"
2424
25 . "launchpad.net/gocheck"25 . "gopkg.in/check.v1"
26)26)
2727
28type DataDirSuite struct{}28type DataDirSuite struct{}
2929
=== modified file 'snappy/dbus_test.go'
--- snappy/dbus_test.go 2015-04-19 01:24:03 +0000
+++ snappy/dbus_test.go 2015-08-02 12:24:18 +0000
@@ -1,7 +1,7 @@
1package snappy1package snappy
22
3import (3import (
4 . "launchpad.net/gocheck"4 . "gopkg.in/check.v1"
5)5)
66
7// systemd's testsuite7// systemd's testsuite
88
=== modified file 'snappy/firstboot_test.go'
--- snappy/firstboot_test.go 2015-04-14 16:46:57 +0000
+++ snappy/firstboot_test.go 2015-08-02 12:24:18 +0000
@@ -22,7 +22,7 @@
22 "os"22 "os"
23 "path/filepath"23 "path/filepath"
2424
25 . "launchpad.net/gocheck"25 . "gopkg.in/check.v1"
26)26)
2727
28type fakePart struct {28type fakePart struct {
2929
=== modified file 'snappy/hashes_test.go'
--- snappy/hashes_test.go 2015-03-31 14:12:52 +0000
+++ snappy/hashes_test.go 2015-08-02 12:24:18 +0000
@@ -24,7 +24,7 @@
2424
25 "gopkg.in/yaml.v2"25 "gopkg.in/yaml.v2"
2626
27 . "launchpad.net/gocheck"27 . "gopkg.in/check.v1"
28)28)
2929
30var fileHashYaml = `name: foo30var fileHashYaml = `name: foo
3131
=== modified file 'snappy/hwaccess_test.go'
--- snappy/hwaccess_test.go 2015-05-01 12:32:42 +0000
+++ snappy/hwaccess_test.go 2015-08-02 12:24:18 +0000
@@ -23,7 +23,7 @@
2323
24 "launchpad.net/snappy/helpers"24 "launchpad.net/snappy/helpers"
2525
26 . "launchpad.net/gocheck"26 . "gopkg.in/check.v1"
27)27)
2828
29func mockRegenerateAppArmorRules() *bool {29func mockRegenerateAppArmorRules() *bool {
3030
=== modified file 'snappy/install_test.go'
--- snappy/install_test.go 2015-04-17 20:54:23 +0000
+++ snappy/install_test.go 2015-08-02 12:24:18 +0000
@@ -26,7 +26,7 @@
26 "os"26 "os"
27 "path/filepath"27 "path/filepath"
2828
29 . "launchpad.net/gocheck"29 . "gopkg.in/check.v1"
30 "launchpad.net/snappy/helpers"30 "launchpad.net/snappy/helpers"
31 "launchpad.net/snappy/progress"31 "launchpad.net/snappy/progress"
32)32)
3333
=== modified file 'snappy/oem_test.go'
--- snappy/oem_test.go 2015-04-22 12:55:07 +0000
+++ snappy/oem_test.go 2015-08-02 12:24:18 +0000
@@ -26,7 +26,7 @@
2626
27 "launchpad.net/snappy/helpers"27 "launchpad.net/snappy/helpers"
2828
29 . "launchpad.net/gocheck"29 . "gopkg.in/check.v1"
30)30)
3131
32type OemSuite struct {32type OemSuite struct {
3333
=== modified file 'snappy/parts_test.go'
--- snappy/parts_test.go 2015-04-21 12:05:22 +0000
+++ snappy/parts_test.go 2015-08-02 12:24:18 +0000
@@ -22,7 +22,7 @@
22 "os"22 "os"
23 "path/filepath"23 "path/filepath"
2424
25 . "launchpad.net/gocheck"25 . "gopkg.in/check.v1"
2626
27 "launchpad.net/snappy/progress"27 "launchpad.net/snappy/progress"
28)28)
2929
=== modified file 'snappy/purge_test.go'
--- snappy/purge_test.go 2015-04-20 19:26:04 +0000
+++ snappy/purge_test.go 2015-08-02 12:24:18 +0000
@@ -23,7 +23,7 @@
23 "os"23 "os"
24 "path/filepath"24 "path/filepath"
2525
26 . "launchpad.net/gocheck"26 . "gopkg.in/check.v1"
2727
28 "launchpad.net/snappy/helpers"28 "launchpad.net/snappy/helpers"
29 "launchpad.net/snappy/systemd"29 "launchpad.net/snappy/systemd"
3030
=== modified file 'snappy/remove_test.go'
--- snappy/remove_test.go 2015-04-15 13:17:22 +0000
+++ snappy/remove_test.go 2015-08-02 12:24:18 +0000
@@ -18,7 +18,7 @@
18package snappy18package snappy
1919
20import (20import (
21 . "launchpad.net/gocheck"21 . "gopkg.in/check.v1"
22 "launchpad.net/snappy/progress"22 "launchpad.net/snappy/progress"
23)23)
2424
2525
=== modified file 'snappy/rollback_test.go'
--- snappy/rollback_test.go 2015-04-30 16:56:15 +0000
+++ snappy/rollback_test.go 2015-08-02 12:24:18 +0000
@@ -18,7 +18,7 @@
18package snappy18package snappy
1919
20import (20import (
21 . "launchpad.net/gocheck"21 . "gopkg.in/check.v1"
22)22)
2323
24func (s *SnapTestSuite) TestRollbackWithVersion(c *C) {24func (s *SnapTestSuite) TestRollbackWithVersion(c *C) {
2525
=== modified file 'snappy/security_test.go'
--- snappy/security_test.go 2015-07-06 19:56:46 +0000
+++ snappy/security_test.go 2015-08-02 12:24:18 +0000
@@ -5,7 +5,7 @@
5 "os"5 "os"
6 "path/filepath"6 "path/filepath"
77
8 . "launchpad.net/gocheck"8 . "gopkg.in/check.v1"
9)9)
1010
11type SecurityTestSuite struct {11type SecurityTestSuite struct {
1212
=== modified file 'snappy/set_test.go'
--- snappy/set_test.go 2015-04-30 16:56:15 +0000
+++ snappy/set_test.go 2015-08-02 12:24:18 +0000
@@ -22,7 +22,7 @@
22 "path/filepath"22 "path/filepath"
23 "strings"23 "strings"
2424
25 . "launchpad.net/gocheck"25 . "gopkg.in/check.v1"
2626
27 "launchpad.net/snappy/progress"27 "launchpad.net/snappy/progress"
28)28)
2929
=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go 2015-07-07 02:35:22 +0000
+++ snappy/snapp_test.go 2015-08-02 12:24:18 +0000
@@ -34,7 +34,7 @@
34 "launchpad.net/snappy/release"34 "launchpad.net/snappy/release"
35 "launchpad.net/snappy/systemd"35 "launchpad.net/snappy/systemd"
3636
37 . "launchpad.net/gocheck"37 . "gopkg.in/check.v1"
38)38)
3939
40type SnapTestSuite struct {40type SnapTestSuite struct {
4141
=== modified file 'snappy/sort_test.go'
--- snappy/sort_test.go 2015-03-26 09:12:58 +0000
+++ snappy/sort_test.go 2015-08-02 12:24:18 +0000
@@ -20,7 +20,7 @@
20import (20import (
21 "sort"21 "sort"
2222
23 . "launchpad.net/gocheck"23 . "gopkg.in/check.v1"
24)24)
2525
26type SortTestSuite struct {26type SortTestSuite struct {
2727
=== modified file 'snappy/systemimage_native_test.go'
--- snappy/systemimage_native_test.go 2015-03-26 09:12:58 +0000
+++ snappy/systemimage_native_test.go 2015-08-02 12:24:18 +0000
@@ -25,7 +25,7 @@
25 "path/filepath"25 "path/filepath"
26 "time"26 "time"
2727
28 . "launchpad.net/gocheck"28 . "gopkg.in/check.v1"
29)29)
3030
31/* acquired via:31/* acquired via:
3232
=== modified file 'snappy/systemimage_test.go'
--- snappy/systemimage_test.go 2015-07-15 07:37:44 +0000
+++ snappy/systemimage_test.go 2015-08-02 12:24:18 +0000
@@ -28,10 +28,10 @@
2828
29 partition "launchpad.net/snappy/partition"29 partition "launchpad.net/snappy/partition"
3030
31 . "launchpad.net/gocheck"31 . "gopkg.in/check.v1"
32)32)
3333
34// Hook up gocheck into the "go test" runner34// Hook up check.v1 into the "go test" runner
35func Test(t *testing.T) { TestingT(t) }35func Test(t *testing.T) { TestingT(t) }
3636
37type SITestSuite struct {37type SITestSuite struct {
3838
=== modified file 'snappy/timeout_test.go'
--- snappy/timeout_test.go 2015-04-13 22:20:58 +0000
+++ snappy/timeout_test.go 2015-08-02 12:24:18 +0000
@@ -21,7 +21,7 @@
21 "encoding/json"21 "encoding/json"
22 "time"22 "time"
2323
24 . "launchpad.net/gocheck"24 . "gopkg.in/check.v1"
25)25)
2626
27func (s *SnapTestSuite) TestTimeoutMarshal(c *C) {27func (s *SnapTestSuite) TestTimeoutMarshal(c *C) {
2828
=== modified file 'snappy/udev_test.go'
--- snappy/udev_test.go 2015-04-20 12:50:45 +0000
+++ snappy/udev_test.go 2015-08-02 12:24:18 +0000
@@ -18,7 +18,7 @@
18package snappy18package snappy
1919
20import (20import (
21 . "launchpad.net/gocheck"21 . "gopkg.in/check.v1"
22)22)
2323
24func (s *SnapTestSuite) TestGetUdevPartName(c *C) {24func (s *SnapTestSuite) TestGetUdevPartName(c *C) {
2525
=== modified file 'systemd/systemd_test.go'
--- systemd/systemd_test.go 2015-07-06 15:33:44 +0000
+++ systemd/systemd_test.go 2015-08-02 12:24:18 +0000
@@ -24,7 +24,7 @@
24 "testing"24 "testing"
25 "time"25 "time"
2626
27 . "launchpad.net/gocheck"27 . "gopkg.in/check.v1"
2828
29 "launchpad.net/snappy/helpers"29 "launchpad.net/snappy/helpers"
30)30)
@@ -37,7 +37,7 @@
37 tr.msgs = append(tr.msgs, msg)37 tr.msgs = append(tr.msgs, msg)
38}38}
3939
40// Hook up gocheck into the "go test" runner40// Hook up check.v1 into the "go test" runner
41func Test(t *testing.T) { TestingT(t) }41func Test(t *testing.T) { TestingT(t) }
4242
43// systemd's testsuite43// systemd's testsuite

Subscribers

People subscribed via source and target branches

to all changes: