From a92eb572d738bf58d86b482dd45d6ef156c2b846 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 9 Feb 2016 19:17:55 -0700
Subject: [PATCH] disable acl tests

---
 .gitignore                                       | 3 ++-
 pom.xml                                          | 1 +
 src/test/bash/travis_run_consul.sh               | 6 +++---
 src/test/resources/consul_config/acl_config.json | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd30bcf4..51a44355 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ _site/
 .idea
 *.iml
 .factorypath
-*.swp
\ No newline at end of file
+*.swp
+consul
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6a256e14..15c10879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,7 @@
 						<configuration>
 							<excludes>
 								<exclude>**/ConsulPropertySourceLocatorTests.java</exclude>
+								<exclude>**/ConsulDiscoveryClientAclTests.java</exclude>
 							</excludes>
 						</configuration>
 					</plugin>
diff --git a/src/test/bash/travis_run_consul.sh b/src/test/bash/travis_run_consul.sh
index 881ff5df..cf0337ad 100755
--- a/src/test/bash/travis_run_consul.sh
+++ b/src/test/bash/travis_run_consul.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 BASEDIR=`dirname $0`/../../..
-${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui -config-dir ${BASEDIR}/src/test/resources/consul_config &
+${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui #-config-dir ${BASEDIR}/src/test/resources/consul_config &
 # wait for consul to elect a leader before sending acl
-sleep 5
-curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
+#sleep 5
+#curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
diff --git a/src/test/resources/consul_config/acl_config.json b/src/test/resources/consul_config/acl_config.json
index ea9e761b..787f1eb5 100644
--- a/src/test/resources/consul_config/acl_config.json
+++ b/src/test/resources/consul_config/acl_config.json
@@ -2,5 +2,5 @@
   "datacenter": "local",
   "acl_datacenter": "local",
   "acl_master_token": "2ee647bd-bd69-4118-9f34-b9a6e9e60746",
-  "acl_default_policy": "deny"
+  "acl_default_policy": "write"
 }