status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: Turns off ACLs for catalog and health WAN translation tests. 

Since this was doing registration to a foreign DC, it needs extra time
for the route to the ACL datacenter to be set up. ACLs aren't part of
this test, so by disabling them we make this more reliable and converge
faster than if we had added a retry.
This commit is contained in:
James Phillips 2017-05-04 15:10:36 -07:00 committed by Frank Schroeder
parent 888fa5cad6
commit 2de1cd5a4a
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/catalog_endpoint_test.go
View File

@ -195,6 +195,7 @@ func TestCatalogNodes_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc1" c.Datacenter = "dc1"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir1) defer os.RemoveAll(dir1)
defer srv1.Shutdown() defer srv1.Shutdown()
@ -205,6 +206,7 @@ func TestCatalogNodes_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc2" c.Datacenter = "dc2"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir2) defer os.RemoveAll(dir2)
defer srv2.Shutdown() defer srv2.Shutdown()
@ -674,6 +676,7 @@ func TestCatalogServiceNodes_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc1" c.Datacenter = "dc1"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir1) defer os.RemoveAll(dir1)
defer srv1.Shutdown() defer srv1.Shutdown()
@ -684,6 +687,7 @@ func TestCatalogServiceNodes_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc2" c.Datacenter = "dc2"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir2) defer os.RemoveAll(dir2)
defer srv2.Shutdown() defer srv2.Shutdown()
@ -913,6 +917,7 @@ func TestCatalogNodeServices_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc1" c.Datacenter = "dc1"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir1) defer os.RemoveAll(dir1)
defer srv1.Shutdown() defer srv1.Shutdown()
@ -923,6 +928,7 @@ func TestCatalogNodeServices_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc2" c.Datacenter = "dc2"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir2) defer os.RemoveAll(dir2)
defer srv2.Shutdown() defer srv2.Shutdown()

2
command/agent/dns_test.go
View File

@ -1280,6 +1280,7 @@ func TestDNS_ServiceLookup_WanAddress(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc1" c.Datacenter = "dc1"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}, nil) }, nil)
defer os.RemoveAll(dir1) defer os.RemoveAll(dir1)
defer srv1.Shutdown() defer srv1.Shutdown()
@ -1287,6 +1288,7 @@ func TestDNS_ServiceLookup_WanAddress(t *testing.T) {
dir2, srv2 := makeDNSServerConfig(t, func(c *Config) { dir2, srv2 := makeDNSServerConfig(t, func(c *Config) {
c.Datacenter = "dc2" c.Datacenter = "dc2"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}, nil) }, nil)
defer os.RemoveAll(dir2) defer os.RemoveAll(dir2)
defer srv2.Shutdown() defer srv2.Shutdown()

2
command/agent/health_endpoint_test.go
View File

@ -738,6 +738,7 @@ func TestHealthServiceNodes_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc1" c.Datacenter = "dc1"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir1) defer os.RemoveAll(dir1)
defer srv1.Shutdown() defer srv1.Shutdown()
@ -748,6 +749,7 @@ func TestHealthServiceNodes_WanTranslation(t *testing.T) {
func(c *Config) { func(c *Config) {
c.Datacenter = "dc2" c.Datacenter = "dc2"
c.TranslateWanAddrs = true c.TranslateWanAddrs = true
c.ACLDatacenter = ""
}) })
defer os.RemoveAll(dir2) defer os.RemoveAll(dir2)
defer srv2.Shutdown() defer srv2.Shutdown()