From 4fdf9d08a0ca7dcfe1e242de824f14c678d00c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E7=8E=89=E6=A1=94?= <zhaoyuguang@apache.org>
Date: Fri, 18 Oct 2019 23:45:43 +0800
Subject: [PATCH] gateway testcast update (#3652)

* gateway testcast update

* bugfix

* remove -u
---
 test/plugin/run.sh                                           | 2 +-
 test/plugin/scenarios/gateway-scenario/configuration.yml     | 1 +
 .../apm/testcase/sc/gateway/projectA/TestFilterConfig.java   | 2 ++
 .../src/main/resources/application.yml                       | 5 +----
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/plugin/run.sh b/test/plugin/run.sh
index 0075772295..52ebb4d636 100644
--- a/test/plugin/run.sh
+++ b/test/plugin/run.sh
@@ -123,7 +123,7 @@ agent_home_selector() {
 
     target_agent_home=${workspace}/${target_agent_dir}
     mkdir -p ${target_agent_home}
-    cp -fur ${agent_home}/* ${target_agent_home}
+    cp -fr ${agent_home}/* ${target_agent_home}
 
     with_plugins=`echo $with_plugins |sed -e "s/;/ /g"`
     for plugin in ${with_plugins};
diff --git a/test/plugin/scenarios/gateway-scenario/configuration.yml b/test/plugin/scenarios/gateway-scenario/configuration.yml
index f73a1e8ad8..40409eb262 100644
--- a/test/plugin/scenarios/gateway-scenario/configuration.yml
+++ b/test/plugin/scenarios/gateway-scenario/configuration.yml
@@ -20,3 +20,4 @@ healthCheck: http://localhost:8080/provider/b/healthCheck
 startScript: ./bin/startup.sh
 framework: spring-cloud-gateway
 runningMode: with_optional
+withPlugins: apm-spring-cloud-gateway-2.x-plugin-*.jar
diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java
index e7ca68fb63..1e46378d4d 100644
--- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java
+++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java
@@ -18,7 +18,9 @@
 package org.apache.skywalking.apm.testcase.sc.gateway.projectA;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
+@Configuration
 public class TestFilterConfig {
 
     @Bean
diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml
index 07d1fb1108..51774a6b54 100644
--- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml
+++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml
@@ -24,7 +24,4 @@ spring:
       - id: provider_route
         uri: http://localhost:18070
         predicates:
-        - Path=/provider/b/*
-endpoints:
-  refresh:
-    sensitive: false
\ No newline at end of file
+        - Path=/provider/b/*
\ No newline at end of file
-- 
GitLab