moving utils in dedicated file; splitting test_sherpa

Author: larshertel

tests/long_tests.py

@@ -18,13 +18,11 @@
 along with SHERPA.  If not, see <http://www.gnu.org/licenses/>.
 """
 from __future__ import print_function
-import tempfile
-import shutil
 import os
 import pytest
 import sherpa
 import sherpa.schedulers
-from test_sherpa import test_dir
+from testing_utils import *
 
 
 ### The *training script*

tests/test_algorithms.py

@@ -24,11 +24,7 @@
 import logging
 import itertools
 import pytest
-from test_sherpa import get_test_trial
-
-
-logging.basicConfig(level=logging.DEBUG)
-testlogger = logging.getLogger(__name__)
+from testing_utils import *
 
 
 def test_median_stopping_rule():

tests/test_schedulers.py

@@ -20,18 +20,13 @@
 import os
 import sherpa
 import sherpa.schedulers
-import socket
 import tempfile
 import time
-import logging
 import itertools
 import shutil
-from test_sherpa import test_dir
+from testing_utils import *
 
 
-logging.basicConfig(level=logging.DEBUG)
-testlogger = logging.getLogger(__name__)
-
 # Adjust for testing
 SGE_QUEUE_NAME = 'arcus.q'
 SGE_PROJECT_NAME = 'arcus_cpu.p'
@@ -100,7 +95,8 @@ def test_local_scheduler(test_dir):
 
     time.sleep(5)
     testlogger.debug(s.get_status(job_id))
-    assert s.get_status(job_id) == sherpa.schedulers._JobStatus.finished
+    assert s.get_status(job_id) in [sherpa.schedulers._JobStatus.finished, sherpa.schedulers._JobStatus.other]
+
 
     job_id = s.submit_job(["python", "{}/test.py".format(test_dir)])
     time.sleep(1)
@@ -141,6 +137,6 @@ def generate_test_script():
 
         time.sleep(5)
         for id in job_ids:
-            assert s.get_status(id) == sherpa.schedulers._JobStatus.finished
+            assert s.get_status(id) in [sherpa.schedulers._JobStatus.finished, sherpa.schedulers._JobStatus.other]
 
         assert len(s.resources) == 4*multiple