From daf887e54fcc0dc7a9ca031e14830c0e36440943 Mon Sep 17 00:00:00 2001 From: Chris Read Date: Wed, 5 Nov 2014 13:27:15 -0600 Subject: [PATCH] Upgrade gocheck --- Gomfile | 2 +- database/leveldb_test.go | 3 ++- deb/deb_test.go | 3 ++- deb/debian_test.go | 3 ++- deb/format_test.go | 3 ++- deb/list_test.go | 3 ++- deb/local_test.go | 3 ++- deb/package_collection_test.go | 3 ++- deb/package_files_test.go | 3 ++- deb/package_test.go | 3 ++- deb/ppa_test.go | 3 ++- deb/publish_test.go | 3 ++- deb/reflist_test.go | 3 ++- deb/remote_test.go | 3 ++- deb/snapshot_test.go | 3 ++- deb/version_test.go | 2 +- files/files_test.go | 3 ++- files/package_pool_test.go | 3 ++- files/public_test.go | 3 ++- http/download_test.go | 3 ++- http/http_test.go | 3 ++- query/lex_test.go | 3 ++- query/query_test.go | 3 ++- query/syntax_test.go | 3 ++- s3/public_test.go | 3 ++- s3/s3_test.go | 3 ++- utils/checksum_test.go | 3 ++- utils/compress_test.go | 3 ++- utils/config_test.go | 3 ++- utils/human_test.go | 2 +- utils/list_test.go | 2 +- utils/utils_test.go | 3 ++- 32 files changed, 60 insertions(+), 32 deletions(-) diff --git a/Gomfile b/Gomfile index 02a674ac..c3030399 100644 --- a/Gomfile +++ b/Gomfile @@ -19,7 +19,7 @@ gom 'github.com/vaughan0/go-ini', :commit => 'a98ad7ee00ec53921f08832bc06ecf7fd6 gom 'github.com/wsxiaoys/terminal/color', :commit => '5668e431776a7957528361f90ce828266c69ed08' group :test do - gom 'launchpad.net/gocheck' + gom 'gopkg.in/check.v1' end group :development do diff --git a/database/leveldb_test.go b/database/leveldb_test.go index e2624723..2119c388 100644 --- a/database/leveldb_test.go +++ b/database/leveldb_test.go @@ -1,8 +1,9 @@ package database import ( - . "launchpad.net/gocheck" "testing" + + . "gopkg.in/check.v1" ) // Launch gocheck tests diff --git a/deb/deb_test.go b/deb/deb_test.go index d2f720e0..bb1b0a42 100644 --- a/deb/deb_test.go +++ b/deb/deb_test.go @@ -2,9 +2,10 @@ package deb import ( "github.com/smira/aptly/utils" - . "launchpad.net/gocheck" "path/filepath" "runtime" + + . "gopkg.in/check.v1" ) type DebSuite struct { diff --git a/deb/debian_test.go b/deb/debian_test.go index 8406e198..e0cc4870 100644 --- a/deb/debian_test.go +++ b/deb/debian_test.go @@ -1,8 +1,9 @@ package deb import ( - . "launchpad.net/gocheck" "testing" + + . "gopkg.in/check.v1" ) // Launch gocheck tests diff --git a/deb/format_test.go b/deb/format_test.go index b7e843c3..396c4790 100644 --- a/deb/format_test.go +++ b/deb/format_test.go @@ -3,8 +3,9 @@ package deb import ( "bufio" "bytes" - . "launchpad.net/gocheck" "strings" + + . "gopkg.in/check.v1" ) type ControlFileSuite struct { diff --git a/deb/list_test.go b/deb/list_test.go index 547a2fb3..a4d44a8e 100644 --- a/deb/list_test.go +++ b/deb/list_test.go @@ -2,10 +2,11 @@ package deb import ( "errors" - . "launchpad.net/gocheck" "regexp" "sort" "strings" + + . "gopkg.in/check.v1" ) type containsChecker struct { diff --git a/deb/local_test.go b/deb/local_test.go index 0830c1ef..f201b5ad 100644 --- a/deb/local_test.go +++ b/deb/local_test.go @@ -3,7 +3,8 @@ package deb import ( "errors" "github.com/smira/aptly/database" - . "launchpad.net/gocheck" + + . "gopkg.in/check.v1" ) type LocalRepoSuite struct { diff --git a/deb/package_collection_test.go b/deb/package_collection_test.go index 4f1dcc5c..47c72d64 100644 --- a/deb/package_collection_test.go +++ b/deb/package_collection_test.go @@ -3,7 +3,8 @@ package deb import ( "github.com/smira/aptly/database" "github.com/smira/aptly/utils" - . "launchpad.net/gocheck" + + . "gopkg.in/check.v1" ) type PackageCollectionSuite struct { diff --git a/deb/package_files_test.go b/deb/package_files_test.go index 6b2adb39..1b635ce7 100644 --- a/deb/package_files_test.go +++ b/deb/package_files_test.go @@ -3,9 +3,10 @@ package deb import ( "github.com/smira/aptly/files" "github.com/smira/aptly/utils" - . "launchpad.net/gocheck" "os" "path/filepath" + + . "gopkg.in/check.v1" ) type PackageFilesSuite struct { diff --git a/deb/package_test.go b/deb/package_test.go index ddcf754e..713098f3 100644 --- a/deb/package_test.go +++ b/deb/package_test.go @@ -4,10 +4,11 @@ import ( "bytes" "github.com/smira/aptly/files" "github.com/smira/aptly/utils" - . "launchpad.net/gocheck" "os" "path/filepath" "regexp" + + . "gopkg.in/check.v1" ) type PackageSuite struct { diff --git a/deb/ppa_test.go b/deb/ppa_test.go index 99467ce7..c235a0a5 100644 --- a/deb/ppa_test.go +++ b/deb/ppa_test.go @@ -2,7 +2,8 @@ package deb import ( "github.com/smira/aptly/utils" - . "launchpad.net/gocheck" + + . "gopkg.in/check.v1" ) type PpaSuite struct { diff --git a/deb/publish_test.go b/deb/publish_test.go index 1aee5aab..49cbeaf5 100644 --- a/deb/publish_test.go +++ b/deb/publish_test.go @@ -9,9 +9,10 @@ import ( "github.com/smira/aptly/files" "github.com/ugorji/go/codec" "io/ioutil" - . "launchpad.net/gocheck" "os" "path/filepath" + + . "gopkg.in/check.v1" ) type pathExistsChecker struct { diff --git a/deb/reflist_test.go b/deb/reflist_test.go index 21051d17..145b5633 100644 --- a/deb/reflist_test.go +++ b/deb/reflist_test.go @@ -3,7 +3,8 @@ package deb import ( "errors" "github.com/smira/aptly/database" - . "launchpad.net/gocheck" + + . "gopkg.in/check.v1" ) type PackageRefListSuite struct { diff --git a/deb/remote_test.go b/deb/remote_test.go index ababd23c..776a0cd7 100644 --- a/deb/remote_test.go +++ b/deb/remote_test.go @@ -10,9 +10,10 @@ import ( "github.com/smira/aptly/utils" "io" "io/ioutil" - . "launchpad.net/gocheck" "os" "sort" + + . "gopkg.in/check.v1" ) type NullVerifier struct { diff --git a/deb/snapshot_test.go b/deb/snapshot_test.go index 83db0853..edbcd703 100644 --- a/deb/snapshot_test.go +++ b/deb/snapshot_test.go @@ -3,7 +3,8 @@ package deb import ( "errors" "github.com/smira/aptly/database" - . "launchpad.net/gocheck" + + . "gopkg.in/check.v1" ) type SnapshotSuite struct { diff --git a/deb/version_test.go b/deb/version_test.go index 53a47b95..03c40c29 100644 --- a/deb/version_test.go +++ b/deb/version_test.go @@ -1,7 +1,7 @@ package deb import ( - . "launchpad.net/gocheck" + . "gopkg.in/check.v1" ) type VersionSuite struct { diff --git a/files/files_test.go b/files/files_test.go index 523bf714..da7dc358 100644 --- a/files/files_test.go +++ b/files/files_test.go @@ -1,8 +1,9 @@ package files import ( - . "launchpad.net/gocheck" "testing" + + . "gopkg.in/check.v1" ) // Launch gocheck tests diff --git a/files/package_pool_test.go b/files/package_pool_test.go index 9042fee3..6025941e 100644 --- a/files/package_pool_test.go +++ b/files/package_pool_test.go @@ -2,10 +2,11 @@ package files import ( "io/ioutil" - . "launchpad.net/gocheck" "os" "path/filepath" "runtime" + + . "gopkg.in/check.v1" ) type PackagePoolSuite struct { diff --git a/files/public_test.go b/files/public_test.go index b619465f..5648c142 100644 --- a/files/public_test.go +++ b/files/public_test.go @@ -2,10 +2,11 @@ package files import ( "io/ioutil" - . "launchpad.net/gocheck" "os" "path/filepath" "syscall" + + . "gopkg.in/check.v1" ) type PublishedStorageSuite struct { diff --git a/http/download_test.go b/http/download_test.go index f54505a7..ed61e3fe 100644 --- a/http/download_test.go +++ b/http/download_test.go @@ -8,12 +8,13 @@ import ( "github.com/smira/aptly/utils" "io" "io/ioutil" - . "launchpad.net/gocheck" "net" "net/http" "os" "runtime" "time" + + . "gopkg.in/check.v1" ) type DownloaderSuite struct { diff --git a/http/http_test.go b/http/http_test.go index c19d909a..fae98be2 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -1,8 +1,9 @@ package http import ( - . "launchpad.net/gocheck" "testing" + + . "gopkg.in/check.v1" ) // Launch gocheck tests diff --git a/query/lex_test.go b/query/lex_test.go index 8eef6513..37e34c40 100644 --- a/query/lex_test.go +++ b/query/lex_test.go @@ -2,7 +2,8 @@ package query import ( "fmt" - . "launchpad.net/gocheck" + + . "gopkg.in/check.v1" ) type LexerSuite struct { diff --git a/query/query_test.go b/query/query_test.go index 84989efd..77a8f1c2 100644 --- a/query/query_test.go +++ b/query/query_test.go @@ -1,8 +1,9 @@ package query import ( - . "launchpad.net/gocheck" "testing" + + . "gopkg.in/check.v1" ) // Launch gocheck tests diff --git a/query/syntax_test.go b/query/syntax_test.go index 3e720f93..32ef0edb 100644 --- a/query/syntax_test.go +++ b/query/syntax_test.go @@ -2,8 +2,9 @@ package query import ( "github.com/smira/aptly/deb" - . "launchpad.net/gocheck" "regexp" + + . "gopkg.in/check.v1" ) type SyntaxSuite struct { diff --git a/s3/public_test.go b/s3/public_test.go index d2ab8ee0..e10df56c 100644 --- a/s3/public_test.go +++ b/s3/public_test.go @@ -5,9 +5,10 @@ import ( "github.com/mitchellh/goamz/s3/s3test" "github.com/smira/aptly/files" "io/ioutil" - . "launchpad.net/gocheck" "os" "path/filepath" + + . "gopkg.in/check.v1" ) type PublishedStorageSuite struct { diff --git a/s3/s3_test.go b/s3/s3_test.go index 353b6b52..3998d887 100644 --- a/s3/s3_test.go +++ b/s3/s3_test.go @@ -1,8 +1,9 @@ package s3 import ( - . "launchpad.net/gocheck" "testing" + + . "gopkg.in/check.v1" ) // Launch gocheck tests diff --git a/utils/checksum_test.go b/utils/checksum_test.go index 5b1cfd5c..e31396fa 100644 --- a/utils/checksum_test.go +++ b/utils/checksum_test.go @@ -2,8 +2,9 @@ package utils import ( "io/ioutil" - . "launchpad.net/gocheck" "os" + + . "gopkg.in/check.v1" ) type ChecksumSuite struct { diff --git a/utils/compress_test.go b/utils/compress_test.go index 3763a167..82d48b14 100644 --- a/utils/compress_test.go +++ b/utils/compress_test.go @@ -4,8 +4,9 @@ import ( "compress/bzip2" "compress/gzip" "io/ioutil" - . "launchpad.net/gocheck" "os" + + . "gopkg.in/check.v1" ) type CompressSuite struct { diff --git a/utils/config_test.go b/utils/config_test.go index cc56cdb5..306fd332 100644 --- a/utils/config_test.go +++ b/utils/config_test.go @@ -1,9 +1,10 @@ package utils import ( - . "launchpad.net/gocheck" "os" "path/filepath" + + . "gopkg.in/check.v1" ) type ConfigSuite struct { diff --git a/utils/human_test.go b/utils/human_test.go index 3be6d385..d1ef09fd 100644 --- a/utils/human_test.go +++ b/utils/human_test.go @@ -1,7 +1,7 @@ package utils import ( - . "launchpad.net/gocheck" + . "gopkg.in/check.v1" ) type HumanSuite struct{} diff --git a/utils/list_test.go b/utils/list_test.go index f8165555..b16e5aef 100644 --- a/utils/list_test.go +++ b/utils/list_test.go @@ -1,7 +1,7 @@ package utils import ( - . "launchpad.net/gocheck" + . "gopkg.in/check.v1" ) type ListSuite struct { diff --git a/utils/utils_test.go b/utils/utils_test.go index 164a64ef..2832292c 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -1,8 +1,9 @@ package utils import ( - . "launchpad.net/gocheck" "testing" + + . "gopkg.in/check.v1" ) // Launch gocheck tests