Skip to content

Commit

Permalink
[FAB-9403] Replace docker/docker/pkg/testutil/assert
Browse files Browse the repository at this point in the history
Not sure why, but a few test files were using the docker
testutil/assert package instead of using the
testify/assert package.

Once the test file changes were made, updated the
dependencies as well

Change-Id: Ic40773a71843af9124524235b24c1a394a4e4f0a
Signed-off-by: Gari Singh <[email protected]>
  • Loading branch information
mastersingh24 committed Apr 7, 2018
1 parent d494dcd commit 65d2fbb
Show file tree
Hide file tree
Showing 22 changed files with 4 additions and 3,251 deletions.
8 changes: 1 addition & 7 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ ignored = [
name = "github.com/davecgh/go-spew"
version = "1.1.0"

[[constraint]]
name = "github.com/docker/docker"
version = "1.13.1"

[[constraint]]
name = "github.com/fsouza/go-dockerclient"
version = "docker-1.9/go-1.4"
Expand Down
2 changes: 1 addition & 1 deletion core/common/validation/resourceupdate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ package validation
import (
"testing"

"github.com/docker/docker/pkg/testutil/assert"
"github.com/hyperledger/fabric/common/mocks/config"
"github.com/hyperledger/fabric/common/util"
cb "github.com/hyperledger/fabric/protos/common"
"github.com/hyperledger/fabric/protos/peer"
"github.com/hyperledger/fabric/protos/utils"
"github.com/stretchr/testify/assert"
)

func TestValidateResourceUpdateTx(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion core/handlers/decoration/decorator/decorator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package decorator
import (
"testing"

"github.com/docker/docker/pkg/testutil/assert"
"github.com/hyperledger/fabric/protos/peer"
"github.com/stretchr/testify/assert"
)

func TestDecorator(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion core/handlers/decoration/plugin/decorator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package main
import (
"testing"

"github.com/docker/docker/pkg/testutil/assert"
"github.com/hyperledger/fabric/protos/peer"
"github.com/stretchr/testify/assert"
)

func TestDecorator(t *testing.T) {
Expand Down
Loading

0 comments on commit 65d2fbb

Please sign in to comment.