seleniumFixV2: connected thread pool creation to condition web.allowLuceneIndexing...

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 6bf75d75d6e92e37898baeef0142f07cd26ee014..f47e76cac6431bbbb53b2e9a26fe5e3e5aa1faf8 100644 (file)
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -3096,8 +3096,14 @@ public class GitBlit implements ServletContextListener {
                }\r
                \r
                // schedule lucene engine\r
-               logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes.");\r
-               scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES);\r
+               boolean luceneIndexing = settings.getBoolean(Keys.web.allowLuceneIndexing, true);\r
+               logger.info("Lucene indexing is " + (luceneIndexing ? "" : "not") + " activated");\r
+               \r
+               if (luceneIndexing) {\r
+                       scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2,  TimeUnit.MINUTES);\r
+                       logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes.");      \r
+               }\r
+\r
                \r
                // schedule gc engine\r
                if (gcExecutor.isReady()) {\r

diff --git a/tests/de/akquinet/devops/test/ui/TestUISuite.java b/tests/de/akquinet/devops/test/ui/TestUISuite.java
index 97bd903702f48472b6b82ebd264d7c5392c03b64..08d7a00b18b264bfcb3894a808b11283872186ec 100644 (file)
--- a/tests/de/akquinet/devops/test/ui/TestUISuite.java
+++ b/tests/de/akquinet/devops/test/ui/TestUISuite.java
@@ -27,7 +27,7 @@ import de.akquinet.devops.test.ui.cases.UI_MultiAdminSupportTest;
  *
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ UI_MultiAdminSupportTest.class })
+@Suite.SuiteClasses({ UI_MultiAdminSupportTest.class, UI_MultiAdminSupportTest.class })
 public class TestUISuite {
 
 }

diff --git a/tests/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java b/tests/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
index 9cdad16072737371d5db559eb88acdb18ce63fab..a39257193c0d77d02ae154c75442e9c21182c895 100644 (file)
--- a/tests/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
+++ b/tests/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
@@ -64,7 +64,7 @@ public class UI_MultiAdminSupportTest extends AbstractUITest {
                                .changeAuthorizationControl(RepoEditView.AUTHCONTROL_RWALL));
 
                // with a second admin
-               editView.addRepoAdministrator("admin");
+               editView.addOwner("admin");
                Assert.assertTrue(editView.save());
                // user is automatically forwarded to repo list view
                Assert.assertTrue(view.isEmptyRepo(TEST_MULTI_ADMIN_SUPPORT_REPO_PATH));

diff --git a/tests/de/akquinet/devops/test/ui/view/RepoEditView.java b/tests/de/akquinet/devops/test/ui/view/RepoEditView.java
index ef0a31718796b3cebe0d90cfd8412b4a91ced430..a3365d1c561ff040726360c483e42fd03c28b9c9 100644 (file)
--- a/tests/de/akquinet/devops/test/ui/view/RepoEditView.java
+++ b/tests/de/akquinet/devops/test/ui/view/RepoEditView.java
@@ -68,7 +68,7 @@ public class RepoEditView extends GitblitDashboardView {
                return false;
        }
 
-       private void changeRepoAdministrators(String action,
+       private void changeOwners(String action,
                        String affectedSelection, String username) {
                String xpath = "//select[@name=\"" + affectedSelection
                                + "\"]/option[@value = \"" + username + "\" ]";
@@ -79,13 +79,13 @@ public class RepoEditView extends GitblitDashboardView {
                button.click();
        }
 
-       public void removeRepoAdministrator(String username) {
-               changeRepoAdministrators("remove", "repoAdministrators:selection",
+       public void removeOwner(String username) {
+               changeOwners("remove", "owners:selection",
                                username);
        }
 
-       public void addRepoAdministrator(String username) {
-               changeRepoAdministrators("add", "repoAdministrators:choices", username);
+       public void addOwner(String username) {
+               changeOwners("add", "owners:choices", username);
        }
 
        public WebElement getAccessRestrictionSelection() {