Skip to content

Commit f69eb7d

Browse files
committed
merge dev
2 parents cde5686 + b349f51 commit f69eb7d

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ addons:
1212
organization: yassine-github
1313
token:
1414
secure: PYT5/IbiqFd877vdi+CYTx7srXr5ACvAgBSL4rxPqwVSQUdGIZxVTj8JcZp7Cl2WiDj9zDlTHSDaJDt5ZpXnmN5quJBizuCZDVArm3LoRADjxhOd9N8rQEYEE1TZOHlu1+g1i/abOL+av9Spn7lWk1LvuH5BW3b0GiAdqJFevfnJsUYDh4iYHiMYjTIP5dO/cZUnQzgFgZS6YkMA28cgQIy/F03z6tO9oM6kcJ/DGBnqvdGAT2ZxtWhFaaNwJazlxSePCwnOok+v3vgACzGospTJLQ4AdGklYIK+ljGpz7AbiRs7yhvzsib6i5Wr0IEmZmLiyIgjExPdnV+rXAndgig/0bnhv1YzyEf/hCzMczpHvNa0HDAGCxkTIsw76XlumwPMGURdlypWEoWrz/9cwiPMnQ0XcAOTN56msA5nBbNwnJ9KDKIVWKWg447OhbImlTr+qxHI/L+8e1dFxyA1iBg7/wtU/27V2QRABvhdlVGNn1khdkIKhsueYHbBjloUTILHBFKTtJdZdD2z/Vf9cu51EQDwv5IPfkkz/UER8pw4AVKgFi6v57M3unqE5C6g8dZr5CELAqy3tGjf6v9HaTF3AdGEkyIJuxiiO8LM20MJm+IreR/pIv8SVeT7f747hbPCQ+mMe5rSE4KVtSI88OeUcI193pdd5PBg0jU262I=
15+
- mvn sonar:sonar
1516
cache:
1617
directories:
1718
- '$HOME/.m2/repository'

src/test/java/io/ipdata/client/IpdataFunctionalTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.net.URL;
2323
import java.util.Arrays;
2424
import java.util.List;
25+
import java.util.concurrent.TimeUnit;
2526
import lombok.SneakyThrows;
2627
import org.apache.http.client.HttpClient;
2728
import org.apache.http.conn.ssl.NoopHostnameVerifier;
@@ -148,7 +149,7 @@ public void testError() {
148149
IpdataService serviceWithInvalidKey = Ipdata.builder().url(url)
149150
.key("THIS_IS_AN_INVALID_KEY")
150151
.feignClient(new ApacheHttpClient(HttpClientBuilder.create()
151-
.setSSLHostnameVerifier(new NoopHostnameVerifier())
152+
.setSSLHostnameVerifier(new NoopHostnameVerifier()).setConnectionTimeToLive(10, TimeUnit.SECONDS)
152153
.build())).get();
153154
serviceWithInvalidKey.ipdata("8.8.8.8");
154155
}

0 commit comments

Comments
 (0)