This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 0a67e0ac94cd659d5c3260c132823dc5fc2dad48 Author: liubao <[email protected]> AuthorDate: Thu May 14 11:24:18 2020 +0800 [SCB-1876] part-9: fix local registry tests error --- .../apache/servicecomb/demo/jaxrs/tests/RawJaxrsIntegrationTest.java | 5 +++-- .../java/org/apache/servicecomb/tests/tracing/TracingTestBase.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration-tests/jaxrs-tests/src/test/java/org/apache/servicecomb/demo/jaxrs/tests/RawJaxrsIntegrationTest.java b/integration-tests/jaxrs-tests/src/test/java/org/apache/servicecomb/demo/jaxrs/tests/RawJaxrsIntegrationTest.java index 113aec7..74fb18e 100644 --- a/integration-tests/jaxrs-tests/src/test/java/org/apache/servicecomb/demo/jaxrs/tests/RawJaxrsIntegrationTest.java +++ b/integration-tests/jaxrs-tests/src/test/java/org/apache/servicecomb/demo/jaxrs/tests/RawJaxrsIntegrationTest.java @@ -17,14 +17,15 @@ package org.apache.servicecomb.demo.jaxrs.tests; +import static org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY; + import org.junit.BeforeClass; public class RawJaxrsIntegrationTest extends JaxrsIntegrationTestBase { @BeforeClass public static void setUp() throws Exception { - // TODO : local test -// System.setProperty(LOCAL_REGISTRY_FILE_KEY, "notExistJustForceLocal"); + System.setProperty(LOCAL_REGISTRY_FILE_KEY, "notExistJustForceLocal"); JaxrsTestMain.main(new String[0]); } } diff --git a/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java b/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java index d0670a7..5198e13 100644 --- a/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java +++ b/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java @@ -18,6 +18,7 @@ package org.apache.servicecomb.tests.tracing; import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_TRACING_COLLECTOR_ADDRESS; +import static org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY; import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; import static org.junit.Assert.assertThat; @@ -57,8 +58,7 @@ public class TracingTestBase { } private static void setUpLocalRegistry() { - // TODO : local registry -// System.setProperty(LOCAL_REGISTRY_FILE_KEY, "notExistJustForceLocal"); + System.setProperty(LOCAL_REGISTRY_FILE_KEY, "notExistJustForceLocal"); } protected void assertThatSpansReceivedByZipkin(Collection<String> logs, String... values) {
