This is an automated email from the ASF dual-hosted git repository. zhaoyunxing pushed a commit to branch 1.5 in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit f2ba74554f0d2f84047eb33b589323c50bf66f60 Author: 氕氘氚 <[email protected]> AuthorDate: Sun Jul 25 22:35:17 2021 +0800 fix game integrate error & del useless file (#184) --- .run/game/game-go-game-test.run.xml | 17 ----------------- .run/game/game-go-gate-test.run.xml | 17 ----------------- game/go-server-game/pkg/consumer.go | 4 ++-- game/go-server-game/tests/integration/main_test.go | 4 ++-- game/go-server-gate/tests/integration/main_test.go | 4 ++-- game/website/.DS_Store | Bin 6148 -> 0 bytes general/dubbo3/.DS_Store | Bin 6148 -> 0 bytes general/dubbo3/pb/.DS_Store | Bin 6148 -> 0 bytes start_integrate_test.sh | 6 +++--- 9 files changed, 9 insertions(+), 43 deletions(-) diff --git a/.run/game/game-go-game-test.run.xml b/.run/game/game-go-game-test.run.xml deleted file mode 100644 index 4e851e5..0000000 --- a/.run/game/game-go-game-test.run.xml +++ /dev/null @@ -1,17 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="game-go-game-test" type="GoTestRunConfiguration" factoryName="Go Test" folderName="game"> - <module name="dubbo-go-samples" /> - <working_directory value="$PROJECT_DIR$/game" /> - <useCustomBuildTags value="true" /> - <envs> - <env name="CONF_CONSUMER_FILE_PATH" value="go-server-game/conf/test_client.yml" /> - <env name="APP_LOG_CONF_FILE" value="go-server-game/conf/log.yml" /> - </envs> - <framework value="gotest" /> - <kind value="PACKAGE" /> - <package value="github.com/apache/dubbo-go-samples/game/go-server-game/tests/integration" /> - <directory value="$PROJECT_DIR$" /> - <filePath value="$PROJECT_DIR$" /> - <method v="2" /> - </configuration> -</component> \ No newline at end of file diff --git a/.run/game/game-go-gate-test.run.xml b/.run/game/game-go-gate-test.run.xml deleted file mode 100644 index d943826..0000000 --- a/.run/game/game-go-gate-test.run.xml +++ /dev/null @@ -1,17 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="game-go-gate-test" type="GoTestRunConfiguration" factoryName="Go Test" folderName="game"> - <module name="dubbo-go-samples" /> - <working_directory value="$PROJECT_DIR$/game" /> - <useCustomBuildTags value="true" /> - <envs> - <env name="CONF_CONSUMER_FILE_PATH" value="go-server-gate/conf/test_client.yml" /> - <env name="APP_LOG_CONF_FILE" value="go-server-gate/conf/log.yml" /> - </envs> - <framework value="gotest" /> - <kind value="PACKAGE" /> - <package value="github.com/apache/dubbo-go-samples/game/go-server-gate/tests/integration" /> - <directory value="$PROJECT_DIR$" /> - <filePath value="$PROJECT_DIR$" /> - <method v="2" /> - </configuration> -</component> \ No newline at end of file diff --git a/game/go-server-game/pkg/consumer.go b/game/go-server-game/pkg/consumer.go index c879fae..a6dba8f 100644 --- a/game/go-server-game/pkg/consumer.go +++ b/game/go-server-game/pkg/consumer.go @@ -1,7 +1,7 @@ package pkg import ( - "github.com/apache/dubbo-go-samples/game/pkg/consumer/gate" + "github.com/apache/dubbo-go-samples/game/go-server-gate/pkg" ) -var GateBasketball = new(gate.BasketballService) +var GateBasketball = new(pkg.BasketballService) diff --git a/game/go-server-game/tests/integration/main_test.go b/game/go-server-game/tests/integration/main_test.go index 9459f1a..187f8c5 100644 --- a/game/go-server-game/tests/integration/main_test.go +++ b/game/go-server-game/tests/integration/main_test.go @@ -20,11 +20,11 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/game/pkg/consumer/game" + "github.com/apache/dubbo-go-samples/game/go-server-game/pkg" "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) -var gameProvider = new(game.BasketballService) +var gameProvider = new(pkg.BasketballService) func TestMain(m *testing.M) { config.SetConsumerService(gameProvider) diff --git a/game/go-server-gate/tests/integration/main_test.go b/game/go-server-gate/tests/integration/main_test.go index 88bf8d3..d782b3e 100644 --- a/game/go-server-gate/tests/integration/main_test.go +++ b/game/go-server-gate/tests/integration/main_test.go @@ -20,11 +20,11 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/game/pkg/consumer/gate" + "github.com/apache/dubbo-go-samples/game/go-server-gate/pkg" "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) -var gateProvider = new(gate.BasketballService) +var gateProvider = new(pkg.BasketballService) func TestMain(m *testing.M) { config.SetConsumerService(gateProvider) diff --git a/game/website/.DS_Store b/game/website/.DS_Store deleted file mode 100644 index 8c27301..0000000 Binary files a/game/website/.DS_Store and /dev/null differ diff --git a/general/dubbo3/.DS_Store b/general/dubbo3/.DS_Store deleted file mode 100644 index b85adcb..0000000 Binary files a/general/dubbo3/.DS_Store and /dev/null differ diff --git a/general/dubbo3/pb/.DS_Store b/general/dubbo3/pb/.DS_Store deleted file mode 100644 index e7e3e36..0000000 Binary files a/general/dubbo3/pb/.DS_Store and /dev/null differ diff --git a/start_integrate_test.sh b/start_integrate_test.sh index add9bdc..edeedc7 100755 --- a/start_integrate_test.sh +++ b/start_integrate_test.sh @@ -29,8 +29,8 @@ array+=("filter/tpslimit/go-server") array+=("filter/sentinel/go-server") # game -#array+=("game/go-server-game") # Bug -#array+=("game/go-server-gate") # Bug +array+=("game/go-server-game") +array+=("game/go-server-gate") # general array+=("general/dubbo/go-server") @@ -55,7 +55,7 @@ array+=("metric/go-server") #array+=("multi-zone") # Unsupported # registry -array=("registry/etcd/go-server") # M1 ignore +array+=("registry/etcd/go-server") # M1 ignore array+=("registry/nacos/go-server") #array+=("registry/servicediscovery/consul/go-server") # M1 ignore & Bug array+=("registry/servicediscovery/etcd/go-server") # M1 ignore
