Skip to content

Commit

Permalink
#186: Unify consul versions in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vgv committed Sep 6, 2019
1 parent ce1d547 commit 2929a96
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions src/test/java/com/ecwid/consul/v1/ConsulClientTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ecwid.consul.v1;

import com.ecwid.consul.ConsulTestConstants;
import com.ecwid.consul.transport.TLSConfig;
import com.ecwid.consul.v1.agent.model.NewService;
import com.ecwid.consul.v1.agent.model.Service;
Expand Down Expand Up @@ -40,7 +41,7 @@ public void setup() {
"}\n";

consul = ConsulStarterBuilder.consulStarter()
.withConsulVersion("1.0.6")
.withConsulVersion(ConsulTestConstants.CONSUL_VERSION)
.withCustomConfig(customConfiguration)
.build()
.start();
Expand Down Expand Up @@ -90,4 +91,4 @@ private void serviceRegisterTest(ConsulClient consulClient) {
Map<String, Service> services = agentServicesResponse.getValue();
assertThat(services, IsMapContaining.hasKey(serviceName));
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ecwid.consul.v1.acl;

import com.ecwid.consul.ConsulTestConstants;
import com.ecwid.consul.v1.Response;
import com.ecwid.consul.v1.acl.model.Acl;
import com.ecwid.consul.v1.acl.model.AclType;
Expand Down Expand Up @@ -31,7 +32,7 @@ public void setup() {
", \"datacenter\": \"dc-test\" }";

consul = ConsulStarterBuilder.consulStarter()
.withConsulVersion("1.0.6")
.withConsulVersion(ConsulTestConstants.CONSUL_VERSION)
.withHttpPort(port)
.withCustomConfig(customConfiguration)
.build()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ecwid.consul.v1.kv;

import com.ecwid.consul.ConsulTestConstants;
import com.pszymczyk.consul.ConsulProcess;
import com.pszymczyk.consul.ConsulStarterBuilder;
import com.pszymczyk.consul.infrastructure.Ports;
Expand All @@ -23,7 +24,7 @@ class KeyValueConsulClientTest {
@BeforeEach
void setUp() {
consul = ConsulStarterBuilder.consulStarter()
.withConsulVersion("1.6.0")
.withConsulVersion(ConsulTestConstants.CONSUL_VERSION)
.withHttpPort(port)
.build()
.start();
Expand Down

0 comments on commit 2929a96

Please sign in to comment.