Repository: thrift Updated Branches: refs/heads/master 085627309 -> 56a03be3f
THRIFT-3192 Go import paths changed in 1.4, and expired June 1 Client: Go Patch: Adam Beberg <[email protected]> This closes #523 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/56a03be3 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/56a03be3 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/56a03be3 Branch: refs/heads/master Commit: 56a03be3f9bf251d17c89034e4c8f2e668211317 Parents: 0856273 Author: Jens Geyer <[email protected]> Authored: Wed Jun 17 22:21:27 2015 +0200 Committer: Jens Geyer <[email protected]> Committed: Wed Jun 17 22:21:27 2015 +0200 ---------------------------------------------------------------------- lib/go/test/Makefile.am | 2 +- lib/go/test/tests/client_error_test.go | 2 +- lib/go/test/tests/optional_fields_test.go | 2 +- lib/go/test/tests/protocol_mock.go | 2 +- lib/go/test/tests/required_fields_test.go | 2 +- test/go/Makefile.am | 2 +- test/go/src/common/clientserver_test.go | 2 +- test/go/src/common/mock_handler.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/lib/go/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am index 14e2f78..9d01723 100644 --- a/lib/go/test/Makefile.am +++ b/lib/go/test/Makefile.am @@ -54,7 +54,7 @@ gopath: $(THRIFT) $(THRIFTTEST) \ $(THRIFT) $(THRIFTARGS) InitialismsTest.thrift $(THRIFT) $(THRIFTARGS),read_write_private DontExportRWTest.thrift $(THRIFT) $(THRIFTARGS),ignore_initialisms IgnoreInitialismsTest.thrift - GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock + GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock ln -nfs ../../../thrift gopath/src/thrift ln -nfs ../../tests gopath/src/tests cp -r ./dontexportrwtest gopath/src http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/lib/go/test/tests/client_error_test.go ---------------------------------------------------------------------- diff --git a/lib/go/test/tests/client_error_test.go b/lib/go/test/tests/client_error_test.go index 8fa81cc..829a1dd 100644 --- a/lib/go/test/tests/client_error_test.go +++ b/lib/go/test/tests/client_error_test.go @@ -20,7 +20,7 @@ package tests import ( - "code.google.com/p/gomock/gomock" + "github.com/golang/mock/gomock" "errors" "errortest" "testing" http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/lib/go/test/tests/optional_fields_test.go ---------------------------------------------------------------------- diff --git a/lib/go/test/tests/optional_fields_test.go b/lib/go/test/tests/optional_fields_test.go index 324bf00..34ad660 100644 --- a/lib/go/test/tests/optional_fields_test.go +++ b/lib/go/test/tests/optional_fields_test.go @@ -21,7 +21,7 @@ package tests import ( "bytes" - gomock "code.google.com/p/gomock/gomock" + gomock "github.com/golang/mock/gomock" "optionalfieldstest" "testing" "thrift" http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/lib/go/test/tests/protocol_mock.go ---------------------------------------------------------------------- diff --git a/lib/go/test/tests/protocol_mock.go b/lib/go/test/tests/protocol_mock.go index d3f4078..2238074 100644 --- a/lib/go/test/tests/protocol_mock.go +++ b/lib/go/test/tests/protocol_mock.go @@ -24,7 +24,7 @@ package tests import ( thrift "thrift" - gomock "code.google.com/p/gomock/gomock" + gomock "github.com/golang/mock/gomock" ) // Mock of TProtocol interface http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/lib/go/test/tests/required_fields_test.go ---------------------------------------------------------------------- diff --git a/lib/go/test/tests/required_fields_test.go b/lib/go/test/tests/required_fields_test.go index fcc7f25..2053712 100644 --- a/lib/go/test/tests/required_fields_test.go +++ b/lib/go/test/tests/required_fields_test.go @@ -20,7 +20,7 @@ package tests import ( - "code.google.com/p/gomock/gomock" + "github.com/golang/mock/gomock" "optionalfieldstest" "testing" "thrift" http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/test/go/Makefile.am ---------------------------------------------------------------------- diff --git a/test/go/Makefile.am b/test/go/Makefile.am index e244676..cf0ed58 100644 --- a/test/go/Makefile.am +++ b/test/go/Makefile.am @@ -34,7 +34,7 @@ gopath: $(THRIFT) ThriftTest.thrift $(THRIFTCMD) ThriftTest.thrift $(THRIFTCMD) ../StressTest.thrift ln -nfs ../../../lib/go/thrift src/thrift - GOPATH=`pwd` $(GO) get code.google.com/p/gomock/gomock + GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock touch gopath bin/testclient: gopath http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/test/go/src/common/clientserver_test.go ---------------------------------------------------------------------- diff --git a/test/go/src/common/clientserver_test.go b/test/go/src/common/clientserver_test.go index 1b833c9..0080ead 100644 --- a/test/go/src/common/clientserver_test.go +++ b/test/go/src/common/clientserver_test.go @@ -20,7 +20,7 @@ package common import ( - "code.google.com/p/gomock/gomock" + "github.com/golang/mock/gomock" "errors" "gen/thrifttest" "reflect" http://git-wip-us.apache.org/repos/asf/thrift/blob/56a03be3/test/go/src/common/mock_handler.go ---------------------------------------------------------------------- diff --git a/test/go/src/common/mock_handler.go b/test/go/src/common/mock_handler.go index 8ef3b6e..ec7e051 100644 --- a/test/go/src/common/mock_handler.go +++ b/test/go/src/common/mock_handler.go @@ -23,7 +23,7 @@ package common import ( - gomock "code.google.com/p/gomock/gomock" + gomock "github.com/golang/mock/gomock" thrifttest "gen/thrifttest" )
