Skip to content
Permalink
Browse files

Merge branch 'master' of gitlabhq:github/pretested-integration-plugin…

… into JENKINS-24754
  • Loading branch information...
MadsNielsen committed Sep 18, 2014
2 parents 6d8873b + ae374f4 commit a0259759034cbd5b9c41bb0325fa0983584f4662
@@ -48,6 +48,13 @@

private String readmeFileContents_fromDevBranch;

@After
public void tearDown() throws Exception {
repository.close();
if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
}

public void createValidRepository() throws IOException, GitAPIException {
if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
@@ -102,10 +109,6 @@ public void createValidRepository() throws IOException, GitAPIException {
git.checkout().setName("master").call();

readmeFileContents_fromDevBranch = FileUtils.readFileToString(new File(README_FILE_PATH));

repository.close();
if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
}

private void createRepositoryWithMergeConflict() throws IOException, GitAPIException {
@@ -170,11 +173,6 @@ private void createRepositoryWithMergeConflict() throws IOException, GitAPIExcep
commitCommand.call();

readmeFileContents_fromDevBranch = FileUtils.readFileToString(new File(README_FILE_PATH));

repository.close();

if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
}

private int countCommits() {
@@ -46,6 +46,13 @@

private String readmeFileContents_fromDevBranch;

@After
public void tearDown() throws Exception {
repository.close();
if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
}

public void createValidRepository() throws IOException, GitAPIException {
if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
@@ -102,10 +109,6 @@ public void createValidRepository() throws IOException, GitAPIException {
git.checkout().setName("master").call();

readmeFileContents_fromDevBranch = FileUtils.readFileToString(new File(README_FILE_PATH));

repository.close();
if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
}

private void createRepositoryWithMergeConflict() throws IOException, GitAPIException {
@@ -172,10 +175,6 @@ private void createRepositoryWithMergeConflict() throws IOException, GitAPIExcep
commitCommand.call();

readmeFileContents_fromDevBranch = FileUtils.readFileToString(new File(README_FILE_PATH));

repository.close();
if (GIT_PARENT_DIR.exists())
FileUtils.deleteDirectory(GIT_PARENT_DIR);
}

private int countCommits() {
@@ -184,8 +183,6 @@ private int countCommits() {
try {
Iterator<RevCommit> iterator = git.log().call().iterator();
for ( ; iterator.hasNext() ; ++commitCount ) iterator.next();


} catch (GitAPIException e) {
e.printStackTrace();
}

0 comments on commit a025975

Please sign in to comment.
You can’t perform that action at this time.