Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/test/java/com/gitblit/tests/GitBlitSuite.java

@@ -63,9 +63,10 @@
      GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class, GitDaemonTest.class,

      SshDaemonTest.class, GroovyScriptTest.class, LuceneExecutorTest.class, RepositoryModelTest.class,

      FanoutServiceTest.class, Issue0259Test.class, Issue0271Test.class, HtpasswdAuthenticationTest.class,

      ModelUtilsTest.class, JnaUtilsTest.class, LdapSyncServiceTest.class, FileTicketServiceTest.class,
      ModelUtilsTest.class, JnaUtilsTest.class, LdapSyncServiceTest.class, FileTicketServiceTest.class,

      BranchTicketServiceTest.class, RedisTicketServiceTest.class, AuthenticationManagerTest.class,

      SshKeysDispatcherTest.class })
      SshKeysDispatcherTest.class, UITicketTest.class, PathUtilsTest.class, SshKerberosAuthenticationTest.class,

      GravatarTest.class, FilestoreManagerTest.class, FilestoreServletTest.class })

public class GitBlitSuite {



   public static final File BASEFOLDER = new File("data");

@@ -110,11 +111,11 @@
      return getRepository("test/gitective.git");

   }



   public static Repository getTicketsTestRepository() {
      JGitUtils.createRepository(REPOSITORIES, "gb-tickets.git").close();
      return getRepository("gb-tickets.git");
   }

   public static Repository getTicketsTestRepository() {

      JGitUtils.createRepository(REPOSITORIES, "gb-tickets.git").close();

      return getRepository("gb-tickets.git");

   }



   private static Repository getRepository(String name) {

      try {

         File gitDir = FileKey.resolve(new File(REPOSITORIES, name), FS.DETECTED);