Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

travis-ci build fix. #344

Merged
merged 1 commit into from
May 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
sudo: true
language: java
install: gradle clean build
install: gradle clean
jdk:
- oraclejdk8
addons:
apt:
packages:
- oracle-java8-installer
160 changes: 0 additions & 160 deletions gradlew

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void runAppAndBasicTest() throws InterruptedException, ExecutionException
Thread.sleep(1000);
System.out.println(rest.getJson("http://localhost:8080/registry-app/service-registry/list"));
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
containsString("[{\"port\":8081,"));
containsString("{\"port\":8081,"));

assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
containsString("\"target\":\"my-target\""));
Expand Down Expand Up @@ -95,4 +95,4 @@ private void sendPing(RegisterEntry entry) {
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void runAppAndBasicTest() throws InterruptedException, ExecutionException
Thread.sleep(1000);
System.out.println(rest.getJson("http://localhost:8080/registry-app/service-registry/list"));
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
containsString("[{\"port\":8081,"));
containsString("{\"port\":8081,"));
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
containsString("\"hostname\":\"test-host\""));
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
Expand Down Expand Up @@ -93,4 +93,4 @@ private void sendPing(RegisterEntry entry) {
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ public void initialize() {
public void lock() {
final String lockName = UUID.randomUUID().toString();

DistributedLockService lock = provider.getDistributedLock(1000);
DistributedLockService lock = provider.getDistributedLock(10000);
Assert.assertTrue(lock.tryLock(lockName));
Assert.assertTrue(lock.tryLock(lockName));
DistributedLockService lock2 = provider.getDistributedLock(1000);
DistributedLockService lock2 = provider.getDistributedLock(10000);
Assert.assertFalse(lock2.tryLock(lockName));
}

Expand Down