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

… into JENKINS-24754
jenkinsci · Sep 18, 2014 · a025975 · a025975
2 parents 6d8873b + ae374f4
commit a025975
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/...nkinsci/plugins/pretestedintegration/integration/scm/git/AccumulatedCommitStrategyIT.java b/...nkinsci/plugins/pretestedintegration/integration/scm/git/AccumulatedCommitStrategyIT.java
@@ -48,6 +48,13 @@ public class AccumulatedCommitStrategyIT {
 
     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() {

diff --git a/...rg/jenkinsci/plugins/pretestedintegration/integration/scm/git/SquashCommitStrategyIT.java b/...rg/jenkinsci/plugins/pretestedintegration/integration/scm/git/SquashCommitStrategyIT.java
@@ -46,6 +46,13 @@ public class SquashCommitStrategyIT {
 
     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();
         }