Don't try to start solr blindly, check first, if it is working already

collective · Sep 8, 2015 · 383e386 · 383e386
1 parent 7386341
commit 383e386
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/collective/solr/testing.py b/src/collective/solr/testing.py
@@ -70,6 +70,10 @@ def _find_available_solr_port(self):
     def setUp(self):
         """Start Solr and poll until it is up and running.
         """
+        status = subprocess.check_output(['./solr-instance', 'status'],
+                                         cwd=BUILDOUT_DIR)
+        if status != 'Solr not running.\n':
+            raise Exception("Sor is already running: %s", status)
         self.proc = subprocess.call(
             './solr-instance start -Djetty.port={0}'.format(self.solr_port),
             shell=True,