-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
test : fix mockserverTest fail cause using same port with seata-server (
- Loading branch information
Showing
16 changed files
with
260 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ | |
| # | ||
| server: | ||
| port: 7091 | ||
| servicePort: 8091 | ||
|
|
||
| spring: | ||
| application: | ||
|
|
||
63 changes: 63 additions & 0 deletions
63
test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.seata.common; | ||
|
|
||
| import org.apache.seata.config.ConfigurationCache; | ||
| import org.apache.seata.config.ConfigurationFactory; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * the type ConfigurationTestHelper | ||
| **/ | ||
| public class ConfigurationTestHelper { | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationTestHelper.class); | ||
| private static final long PUT_CONFIG_TIMEOUT = 60000L; | ||
|
|
||
| public static void removeConfig(String dataId) { | ||
| putConfig(dataId, null); | ||
| } | ||
|
|
||
| public static void putConfig(String dataId, String content) { | ||
| CountDownLatch countDownLatch = new CountDownLatch(1); | ||
| ConfigurationCache.addConfigListener(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, event -> countDownLatch.countDown()); | ||
| if (content == null) { | ||
| System.clearProperty(dataId); | ||
| ConfigurationFactory.getInstance().removeConfig(dataId); | ||
| return; | ||
| } | ||
|
|
||
| System.setProperty(dataId, content); | ||
| ConfigurationFactory.getInstance().putConfig(dataId, content); | ||
|
|
||
| try { | ||
| boolean await = countDownLatch.await(PUT_CONFIG_TIMEOUT, TimeUnit.MILLISECONDS); | ||
| if(await){ | ||
| LOGGER.info("putConfig ok, dataId={}", dataId); | ||
| }else { | ||
| LOGGER.error("putConfig fail, dataId={}", dataId); | ||
| } | ||
| } catch (InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.