Skip to content

Commit 33e3e37

Browse files
erizocosmicoerizocosmico
committed
upgrade go-git-fixtures
Signed-off-by: Miguel Molina <[email protected]>
1 parent 3c4100c commit 33e3e37

File tree

17 files changed

+808052
-120
lines changed

17 files changed

+808052
-120
lines changed

‎checksum_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ import (
66
"path/filepath"
77
"testing"
88

9+
fixtures "github.com/src-d/go-git-fixtures"
910
"github.com/stretchr/testify/require"
10-
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
1111
"gopkg.in/src-d/go-git.v4/plumbing/cache"
1212
)
1313

1414
func TestChecksum(t *testing.T) {
1515
require := require.New(t)
1616

17-
require.NoError(fixtures.Init())
1817
defer func() {
1918
require.NoError(fixtures.Clean())
2019
}()
@@ -68,7 +67,6 @@ func TestChecksumSiva(t *testing.T) {
6867
func TestChecksumStable(t *testing.T) {
6968
require := require.New(t)
7069

71-
require.NoError(fixtures.Init())
7270
defer func() {
7371
require.NoError(fixtures.Clean())
7472
}()

‎common_test.go

+3-8
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,31 @@ import (
1010
"sync"
1111
"testing"
1212

13+
fixtures "github.com/src-d/go-git-fixtures"
14+
"github.com/src-d/go-mysql-server/sql"
15+
"github.com/src-d/go-mysql-server/sql/plan"
1316
"github.com/stretchr/testify/require"
1417
sivafs "gopkg.in/src-d/go-billy-siva.v4"
1518
billy "gopkg.in/src-d/go-billy.v4"
1619
"gopkg.in/src-d/go-billy.v4/osfs"
17-
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
1820
git "gopkg.in/src-d/go-git.v4"
1921
"gopkg.in/src-d/go-git.v4/plumbing/cache"
2022
"gopkg.in/src-d/go-git.v4/storage/filesystem"
21-
"github.com/src-d/go-mysql-server/sql"
22-
"github.com/src-d/go-mysql-server/sql/plan"
2323
)
2424

2525
type CleanupFunc func()
2626

2727
func setup(t *testing.T) (*sql.Context, string, CleanupFunc) {
2828
require := require.New(t)
2929
t.Helper()
30-
require.NoError(fixtures.Init())
3130
fxs := []*fixtures.Fixture{fixtures.ByTag("worktree").One()}
3231
ctx, paths, cleanup := buildSession(t, fxs)
3332
require.Len(paths, 1)
3433
return ctx, paths[0], cleanup
3534
}
3635

3736
func setupRepos(t *testing.T) (*sql.Context, []string, CleanupFunc) {
38-
require := require.New(t)
3937
t.Helper()
40-
require.NoError(fixtures.Init())
4138
return buildSession(t, fixtures.ByTag("worktree"))
4239
}
4340

@@ -46,8 +43,6 @@ func buildSession(t *testing.T, repos fixtures.Fixtures,
4643
require := require.New(t)
4744
t.Helper()
4845

49-
require.NoError(fixtures.Init())
50-
5146
pool := NewRepositoryPool(cache.DefaultMaxSize)
5247
for _, fixture := range repos {
5348
path := fixture.Worktree().Root()

‎database_test.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ import (
44
"sort"
55
"testing"
66

7-
"github.com/stretchr/testify/require"
87
"github.com/src-d/go-mysql-server/sql"
9-
10-
"gopkg.in/src-d/go-git-fixtures.v3"
8+
"github.com/stretchr/testify/require"
119
)
1210

13-
func init() {
14-
fixtures.RootFolder = "vendor/gopkg.in/src-d/go-git-fixtures.v3/"
15-
}
16-
1711
const testDBName = "foo"
1812

1913
func TestDatabase_Tables(t *testing.T) {

‎fs_error_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/sirupsen/logrus"
1212
"github.com/stretchr/testify/require"
1313
billy "gopkg.in/src-d/go-billy.v4"
14-
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
14+
fixtures "github.com/src-d/go-git-fixtures"
1515
git "gopkg.in/src-d/go-git.v4"
1616
"gopkg.in/src-d/go-git.v4/plumbing/cache"
1717
"gopkg.in/src-d/go-git.v4/storage/filesystem"
@@ -52,8 +52,6 @@ func setupErrorRepos(t *testing.T) (*sql.Context, CleanupFunc) {
5252

5353
t.Helper()
5454

55-
require.NoError(fixtures.Init())
56-
5755
fixture := fixtures.ByTag("worktree").One()
5856
baseFS := fixture.Worktree()
5957

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
github.com/miekg/dns v1.1.1 // indirect
1515
github.com/opentracing/opentracing-go v1.1.0
1616
github.com/sirupsen/logrus v1.3.0
17+
github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible
1718
github.com/src-d/go-mysql-server v0.4.1-0.20190531100547-4dcaf78ac20d
1819
github.com/stretchr/testify v1.3.0
1920
github.com/toqueteos/trie v0.0.0-20150530104557-56fed4a05683 // indirect
@@ -26,7 +27,7 @@ require (
2627
gopkg.in/src-d/go-billy-siva.v4 v4.2.2
2728
gopkg.in/src-d/go-billy.v4 v4.3.0
2829
gopkg.in/src-d/go-errors.v1 v1.0.0
29-
gopkg.in/src-d/go-git-fixtures.v3 v3.5.0
30+
gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 // indirect
3031
gopkg.in/src-d/go-git.v4 v4.11.0
3132
gopkg.in/src-d/go-siva.v1 v1.3.0 // indirect
3233
gopkg.in/src-d/go-vitess.v1 v1.7.0

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
196196
github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
197197
github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
198198
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
199+
github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible h1:A5bKevhs9C//Nh8QV0J+1KphEaIa25cDe1DTs/yPxDI=
200+
github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible/go.mod h1:XcIQp7L+k0pgfTqfbaTKj3kxlBv8kYOKZ/tKNXbZFLg=
199201
github.com/src-d/go-mysql-server v0.4.1-0.20190531100547-4dcaf78ac20d h1:wJoC2gVGP3UNz96Gsaq2PRtY/LPVeeUwHokSt0J+LwA=
200202
github.com/src-d/go-mysql-server v0.4.1-0.20190531100547-4dcaf78ac20d/go.mod h1:gX+I1R89v9OeNSMKvLnY6wkapOT8067nrGPkFP1+jNE=
201203
github.com/src-d/go-oniguruma v1.0.0 h1:JDk5PUAjreGsGAKLsoDLNmrsaryjJ5RqT3h+Si6aw/E=

‎integration_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/src-d/gitbase"
1717
"github.com/src-d/gitbase/internal/function"
1818
"github.com/stretchr/testify/require"
19-
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
19+
fixtures "github.com/src-d/go-git-fixtures"
2020
"gopkg.in/src-d/go-git.v4/plumbing/cache"
2121
sqle "github.com/src-d/go-mysql-server"
2222
"github.com/src-d/go-mysql-server/auth"
@@ -26,7 +26,6 @@ import (
2626
)
2727

2828
func TestIntegration(t *testing.T) {
29-
require.NoError(t, fixtures.Init())
3029
defer func() {
3130
require.NoError(t, fixtures.Clean())
3231
}()
@@ -991,7 +990,6 @@ func deleteIndex(
991990

992991
func setup(t testing.TB) (*sqle.Engine, *gitbase.RepositoryPool, func()) {
993992
t.Helper()
994-
require.NoError(t, fixtures.Init())
995993
cleanup := func() {
996994
require.NoError(t, fixtures.Clean())
997995
}

‎internal/function/uast_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/stretchr/testify/require"
1313
bblfsh "github.com/bblfsh/go-client/v4"
1414
"github.com/bblfsh/sdk/v3/uast/nodes"
15-
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
15+
fixtures "github.com/src-d/go-git-fixtures"
1616
"gopkg.in/src-d/go-git.v4/plumbing/cache"
1717
"github.com/src-d/go-mysql-server/sql"
1818
"github.com/src-d/go-mysql-server/sql/expression"
@@ -418,7 +418,6 @@ func bblfshFixtures(
418418

419419
func setup(t *testing.T) (*sql.Context, func()) {
420420
t.Helper()
421-
require.NoError(t, fixtures.Init())
422421

423422
pool := gitbase.NewRepositoryPool(cache.DefaultMaxSize)
424423
for _, f := range fixtures.ByTag("worktree") {

‎path_utils_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77

88
"github.com/stretchr/testify/require"
9-
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
9+
fixtures "github.com/src-d/go-git-fixtures"
1010
)
1111

1212
func TestPatternMatches(t *testing.T) {

‎repository_pool_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99

1010
"github.com/stretchr/testify/require"
11-
"gopkg.in/src-d/go-git-fixtures.v3"
11+
"github.com/src-d/go-git-fixtures"
1212
"gopkg.in/src-d/go-git.v4"
1313
"gopkg.in/src-d/go-git.v4/plumbing/cache"
1414
"gopkg.in/src-d/go-git.v4/plumbing/object"

‎squash_iterator_test.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"path/filepath"
66
"testing"
77

8-
"github.com/stretchr/testify/require"
9-
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
10-
"gopkg.in/src-d/go-git.v4/plumbing/cache"
8+
fixtures "github.com/src-d/go-git-fixtures"
119
"github.com/src-d/go-mysql-server/sql"
1210
"github.com/src-d/go-mysql-server/sql/expression"
11+
"github.com/stretchr/testify/require"
12+
"gopkg.in/src-d/go-git.v4/plumbing/cache"
1313
)
1414

1515
func TestAllReposIter(t *testing.T) {
@@ -717,8 +717,6 @@ func setupIter(t *testing.T) (*sql.Context, func()) {
717717
}
718718

719719
func setupIterWithErrors(t *testing.T, badRepo bool, skipErrors bool) (*sql.Context, func()) {
720-
require.NoError(t, fixtures.Init())
721-
722720
pool := NewRepositoryPool(cache.DefaultMaxSize)
723721
if badRepo {
724722
// TODO: add repo with errors

‎vendor/gopkg.in/src-d/go-git-fixtures.v3/LICENSE renamed to ‎vendor/github.com/src-d/go-git-fixtures/LICENSE

File renamed without changes.

‎vendor/github.com/src-d/go-git-fixtures/README.md

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)