THRIFT-3192 Go import paths changed in 1.4, and expired June 1
Client: Go
Patch: Adam Beberg <beberg@sentient.ai>
This closes #523
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 @@
$(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
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"
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 @@
import (
"bytes"
- gomock "code.google.com/p/gomock/gomock"
+ gomock "github.com/golang/mock/gomock"
"optionalfieldstest"
"testing"
"thrift"
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 @@
import (
thrift "thrift"
- gomock "code.google.com/p/gomock/gomock"
+ gomock "github.com/golang/mock/gomock"
)
// Mock of TProtocol interface
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"
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 @@
$(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
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"
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"
)