ci pass

api7 · Dec 3, 2020 · 774a7b2 · 774a7b2
1 parent d603e35
commit 774a7b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
     - env: ETCD_VER=3.1.0 GOREMAN_CONF=Procfile-single
     - env: ETCD_VER=3.2.0 GOREMAN_CONF=Procfile-single
     - env: ETCD_VER=3.3.0 GOREMAN_CONF=Procfile-single-enable-v2
-    - env: ETCD_VER=3.4.0 GOREMAN_CONF=Procfile-single-enable-v2
+    - env: ETCD_VER=3.4.0 GOREMAN_CONF=Procfile-single-enable-v2 AUTH_ENDPOINT_V3=http://127.0.0.1:2379
     - env: ETCD_VER=3.4.0 GOREMAN_CONF=Procfile-single-enable-tls ETCD_ENABLE_TLS=TRUE AUTH_ENDPOINT_V2=https://127.0.0.1:12379 ETCDCTL_EXTRA_OPTS="--insecure-transport=false --insecure-skip-tls-verify=true"
 
 env:

diff --git a/t/v3/auth.t b/t/v3/auth.t
@@ -4,16 +4,11 @@ log_level('info');
 no_long_string();
 repeat_each(1);
 
-my $etcd_version = `etcd --version`;
-if ($etcd_version =~ /^etcd Version: 2/ || $etcd_version =~ /^etcd Version: 3.1./ || $etcd_version =~ /^etcd Version: 3.2./) {
-    plan(skip_all => "etcd is too old, skip v3 protocol");
+my $enable_auth = $ENV{AUTH_ENDPOINT_V3};
+if (defined $enable_auth) {
+    plan 'no_plan';
 } else {
-    my $enable_tls = $ENV{ETCD_ENABLE_TLS};
-    if ((defined $enable_tls) && $enable_tls eq "TRUE") {
-        plan(skip_all => "skip test cases with auth when TLS is enabled");
-    } else {
-        plan 'no_plan';
-    }
+    plan(skip_all => "skip test cases with auth is not enabled");
 }
 
 our $HttpConfig = <<'_EOC_';