From aa4d36a58b95c63e53aa0ec8253cb4984c97c5bd Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Mon, 7 Sep 2020 13:38:52 +0800
Subject: [PATCH] Fix: integration testing problems
---
test/integrate/dubbo/go-client/Dockerfile | 2 +-
test/integrate/dubbo/go-client/go.mod | 4 ----
test/integrate/dubbo/go-server/Dockerfile | 2 +-
test/integrate/dubbo/go-server/go.mod | 4 ----
4 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/test/integrate/dubbo/go-client/Dockerfile b/test/integrate/dubbo/go-client/Dockerfile
index d48df36dc..317b10bac 100644
--- a/test/integrate/dubbo/go-client/Dockerfile
+++ b/test/integrate/dubbo/go-client/Dockerfile
@@ -29,7 +29,7 @@ ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client
# update dubbo-go to current commit id
RUN test ${PR_ORIGIN_REPO} && echo "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}" || echo 'go get github.com/apache/dubbo-go@develop'
-RUN test ${PR_ORIGIN_REPO} && go mod edit -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID} || go get -u github.com/apache/dubbo-go@develop
+RUN test ${PR_ORIGIN_REPO} && go get github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}
RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-client
diff --git a/test/integrate/dubbo/go-client/go.mod b/test/integrate/dubbo/go-client/go.mod
index b0be45ae9..4708eb1f0 100644
--- a/test/integrate/dubbo/go-client/go.mod
+++ b/test/integrate/dubbo/go-client/go.mod
@@ -1,7 +1,3 @@
module github.com/apache/dubbo-go/test/integrate/dubbo/go-client
-require (
- github.com/apache/dubbo-go-hessian2 v1.6.0-rc1.0.20200906044240-6c1fb5c3bd44
-)
-
go 1.13
diff --git a/test/integrate/dubbo/go-server/Dockerfile b/test/integrate/dubbo/go-server/Dockerfile
index c2f2d6346..5cae46f93 100644
--- a/test/integrate/dubbo/go-server/Dockerfile
+++ b/test/integrate/dubbo/go-server/Dockerfile
@@ -28,7 +28,7 @@ ARG PR_ORIGIN_COMMITID
ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-server
# update dubbo-go to current commit id
RUN test ${PR_ORIGIN_REPO} && echo "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}" || echo 'go get github.com/apache/dubbo-go@develop'
-RUN test ${PR_ORIGIN_REPO} && go mod edit -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID} || go get -u github.com/apache/dubbo-go@develop
+RUN test ${PR_ORIGIN_REPO} && go get github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}
RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-server
diff --git a/test/integrate/dubbo/go-server/go.mod b/test/integrate/dubbo/go-server/go.mod
index 6c530f6a5..9e1162327 100644
--- a/test/integrate/dubbo/go-server/go.mod
+++ b/test/integrate/dubbo/go-server/go.mod
@@ -1,7 +1,3 @@
module github.com/apache/dubbo-go/test/integrate/dubbo/go-server
-require (
- github.com/apache/dubbo-go-hessian2 v1.6.0-rc1.0.20200906044240-6c1fb5c3bd44
-)
-
go 1.13
--
GitLab