This is an automated email from the ASF dual-hosted git repository.
shuyangw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 176dc45 test: move all tests under t/ (#3808)
176dc45 is described below
commit 176dc45e6761f17933f0d995fb5b56a219c2a71f
Author: 罗泽轩 <[email protected]>
AuthorDate: Fri Mar 12 00:02:02 2021 +0800
test: move all tests under t/ (#3808)
Signed-off-by: spacewander <[email protected]>
---
.travis/linux_apisix_current_luarocks_runner.sh | 2 +-
{.travis/apisix_cli_test => t/cli}/common.sh | 0
{.travis/apisix_cli_test => t/cli}/test_ci_only.sh | 2 +-
{.travis/apisix_cli_test => t/cli}/test_control.sh | 2 +-
{.travis/apisix_cli_test => t/cli}/test_dns.sh | 2 +-
{.travis/apisix_cli_test => t/cli}/test_dubbo.sh | 2 +-
{.travis/apisix_cli_test => t/cli}/test_etcd_tls.sh | 2 +-
{.travis/apisix_cli_test => t/cli}/test_main.sh | 2 +-
{.travis/apisix_cli_test => t/cli}/test_validate_config.sh | 2 +-
9 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.travis/linux_apisix_current_luarocks_runner.sh
b/.travis/linux_apisix_current_luarocks_runner.sh
index 1f83c4e..dc87896 100755
--- a/.travis/linux_apisix_current_luarocks_runner.sh
+++ b/.travis/linux_apisix_current_luarocks_runner.sh
@@ -56,7 +56,7 @@ script() {
cd ..
# apisix cli test
- for f in ./.travis/apisix_cli_test/test_*.sh; do
+ for f in ./t/cli/test_*.sh; do
sudo PATH="$PATH" "$f"
done
}
diff --git a/.travis/apisix_cli_test/common.sh b/t/cli/common.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .travis/apisix_cli_test/common.sh
rename to t/cli/common.sh
diff --git a/.travis/apisix_cli_test/test_ci_only.sh b/t/cli/test_ci_only.sh
similarity index 98%
rename from .travis/apisix_cli_test/test_ci_only.sh
rename to t/cli/test_ci_only.sh
index 521c2e9..a440cf2 100755
--- a/.travis/apisix_cli_test/test_ci_only.sh
+++ b/t/cli/test_ci_only.sh
@@ -20,7 +20,7 @@
# This file is like other test_*.sh, but requires extra dependencies which
# you don't need in daily development.
-. ./.travis/apisix_cli_test/common.sh
+. ./t/cli/common.sh
# check error handling when connecting to old etcd
git checkout conf/config.yaml
diff --git a/.travis/apisix_cli_test/test_control.sh b/t/cli/test_control.sh
similarity index 98%
rename from .travis/apisix_cli_test/test_control.sh
rename to t/cli/test_control.sh
index 816dd69..d6c50bf 100755
--- a/.travis/apisix_cli_test/test_control.sh
+++ b/t/cli/test_control.sh
@@ -17,7 +17,7 @@
# limitations under the License.
#
-. ./.travis/apisix_cli_test/common.sh
+. ./t/cli/common.sh
# control server
echo '
diff --git a/.travis/apisix_cli_test/test_dns.sh b/t/cli/test_dns.sh
similarity index 97%
rename from .travis/apisix_cli_test/test_dns.sh
rename to t/cli/test_dns.sh
index d1aca15..90db8ce 100755
--- a/.travis/apisix_cli_test/test_dns.sh
+++ b/t/cli/test_dns.sh
@@ -21,7 +21,7 @@
# The 'apisix' command is a command in the /usr/local/apisix,
# and the configuration file for the operation is in the /usr/local/apisix/conf
-. ./.travis/apisix_cli_test/common.sh
+. ./t/cli/common.sh
# dns_resolver_valid
echo '
diff --git a/.travis/apisix_cli_test/test_dubbo.sh b/t/cli/test_dubbo.sh
similarity index 97%
rename from .travis/apisix_cli_test/test_dubbo.sh
rename to t/cli/test_dubbo.sh
index 49814a1..76386f1 100755
--- a/.travis/apisix_cli_test/test_dubbo.sh
+++ b/t/cli/test_dubbo.sh
@@ -17,7 +17,7 @@
# limitations under the License.
#
-. ./.travis/apisix_cli_test/common.sh
+. ./t/cli/common.sh
# enable dubbo
echo '
diff --git a/.travis/apisix_cli_test/test_etcd_tls.sh b/t/cli/test_etcd_tls.sh
similarity index 97%
rename from .travis/apisix_cli_test/test_etcd_tls.sh
rename to t/cli/test_etcd_tls.sh
index 8bde253..906a2b9 100755
--- a/.travis/apisix_cli_test/test_etcd_tls.sh
+++ b/t/cli/test_etcd_tls.sh
@@ -21,7 +21,7 @@
# The 'apisix' command is a command in the /usr/local/apisix,
# and the configuration file for the operation is in the /usr/local/apisix/conf
-. ./.travis/apisix_cli_test/common.sh
+. ./t/cli/common.sh
# Check etcd tls verify failure
git checkout conf/config.yaml
diff --git a/.travis/apisix_cli_test/test_main.sh b/t/cli/test_main.sh
similarity index 99%
rename from .travis/apisix_cli_test/test_main.sh
rename to t/cli/test_main.sh
index 6e261d1..3d611f3 100755
--- a/.travis/apisix_cli_test/test_main.sh
+++ b/t/cli/test_main.sh
@@ -21,7 +21,7 @@
# The 'apisix' command is a command in the /usr/local/apisix,
# and the configuration file for the operation is in the /usr/local/apisix/conf
-. ./.travis/apisix_cli_test/common.sh
+. ./t/cli/common.sh
git checkout conf/config.yaml
diff --git a/.travis/apisix_cli_test/test_validate_config.sh
b/t/cli/test_validate_config.sh
similarity index 96%
rename from .travis/apisix_cli_test/test_validate_config.sh
rename to t/cli/test_validate_config.sh
index 7d597b1..1d2659d 100755
--- a/.travis/apisix_cli_test/test_validate_config.sh
+++ b/t/cli/test_validate_config.sh
@@ -19,7 +19,7 @@
# validate the config.yaml
-. ./.travis/apisix_cli_test/common.sh
+. ./t/cli/common.sh
echo '
apisix:
