SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making tests less brittle

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-01-20 13:06:07 +01:00
parent 7667643176
commit b8c8d1dc2c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java
View File

@@ -216,9 +216,13 @@ public abstract class AbstractSpringAcceptanceTests {
public void checkoutReleaseTrainBranch(String fileToRepo, String branch)
throws GitAPIException, URISyntaxException {
Git git = GitTestUtils.openGitProject(file(fileToRepo));
File file = file(fileToRepo);
Git git = GitTestUtils.openGitProject(file);
git.reset().setMode(ResetCommand.ResetType.HARD).call();
git.checkout().setName(branch).call();
if (new File(file, ".travis.yml").exists()) {
new File(file, ".travis.yml").delete();
}
git.checkout().setForce(true).setName(branch).call();
}
public Git clonedProject(NonAssertingTestProjectGitHandler handler, String name) {