Merge remote-tracking branch 'cread/gocheck'

Gomfile

@@ -20,7 +20,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

database/leveldb_test.go

@@ -1,8 +1,9 @@
 package database
 
 import (
-	. "launchpad.net/gocheck"
 	"testing"
+
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests

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 {

deb/debian_test.go

@@ -1,8 +1,9 @@
 package deb
 
 import (
-	. "launchpad.net/gocheck"
 	"testing"
+
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests

deb/format_test.go

@@ -3,8 +3,9 @@ package deb
 import (
 	"bufio"
 	"bytes"
-	. "launchpad.net/gocheck"
 	"strings"
+
+	. "gopkg.in/check.v1"
 )
 
 type ControlFileSuite struct {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

deb/version_test.go

@@ -1,7 +1,7 @@
 package deb
 
 import (
-	. "launchpad.net/gocheck"
+	. "gopkg.in/check.v1"
 )
 
 type VersionSuite struct {

files/files_test.go

@@ -1,8 +1,9 @@
 package files
 
 import (
-	. "launchpad.net/gocheck"
 	"testing"
+
+	. "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests

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 {

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 {

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 {

http/http_test.go

@@ -1,8 +1,9 @@
 package http
 
 import (
-	. "launchpad.net/gocheck"
 	"testing"
+
+  . "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests

query/lex_test.go

@@ -2,7 +2,8 @@ package query
 
 import (
 	"fmt"
-	. "launchpad.net/gocheck"
+
+  . "gopkg.in/check.v1"
 )
 
 type LexerSuite struct {

query/query_test.go

@@ -1,8 +1,9 @@
 package query
 
 import (
-	. "launchpad.net/gocheck"
 	"testing"
+
+  . "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests

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 {

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 {

s3/s3_test.go

@@ -1,8 +1,9 @@
 package s3
 
 import (
-	. "launchpad.net/gocheck"
 	"testing"
+
+  . "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests

utils/checksum_test.go

@@ -2,8 +2,9 @@ package utils
 
 import (
 	"io/ioutil"
-	. "launchpad.net/gocheck"
 	"os"
+
+  . "gopkg.in/check.v1"
 )
 
 type ChecksumSuite struct {

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 {

utils/config_test.go

@@ -1,9 +1,10 @@
 package utils
 
 import (
-	. "launchpad.net/gocheck"
 	"os"
 	"path/filepath"
+
+  . "gopkg.in/check.v1"
 )
 
 type ConfigSuite struct {

utils/human_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	. "launchpad.net/gocheck"
+  . "gopkg.in/check.v1"
 )
 
 type HumanSuite struct{}

utils/list_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	. "launchpad.net/gocheck"
+  . "gopkg.in/check.v1"
 )
 
 type ListSuite struct {

utils/utils_test.go

@@ -1,8 +1,9 @@
 package utils
 
 import (
-	. "launchpad.net/gocheck"
 	"testing"
+
+  . "gopkg.in/check.v1"
 )
 
 // Launch gocheck tests