PRJ: deactivate virtual x server for osx

SiLab-Bonn · Sep 27, 2017 · e36e9e1 · e36e9e1
1 parent 35581d9
commit e36e9e1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/testbeam_analysis/testing/test_examples.py b/testbeam_analysis/testing/test_examples.py
@@ -64,8 +64,8 @@ class TestExamples(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        # Virtual X server for plots under headless LINUX travis testing needed
-        if os.getenv('TRAVIS', False):
+        # virtual X server for plots under headless LINUX travis testing is needed
+        if os.getenv('TRAVIS', False) and os.getenv('TRAVIS_OS_NAME', False) == 'linux':
             from xvfbwrapper import Xvfb
             cls.vdisplay = Xvfb()
             cls.vdisplay.start()

diff --git a/testbeam_analysis/testing/test_hit_analysis.py b/testbeam_analysis/testing/test_hit_analysis.py
@@ -14,7 +14,8 @@ class TestHitAnalysis(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        if os.getenv('TRAVIS', False):
+        # virtual X server for plots under headless LINUX travis testing is needed
+        if os.getenv('TRAVIS', False) and os.getenv('TRAVIS_OS_NAME', False) == 'linux':
             from xvfbwrapper import Xvfb  # virtual X server for plots under headless LINUX travis testing is needed
             cls.vdisplay = Xvfb()
             cls.vdisplay.start()

diff --git a/testbeam_analysis/testing/test_kalman.py b/testbeam_analysis/testing/test_kalman.py
@@ -14,7 +14,8 @@ class TestTrackAnalysis(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        if os.getenv('TRAVIS', False):
+        # virtual X server for plots under headless LINUX travis testing is needed
+        if os.getenv('TRAVIS', False) and os.getenv('TRAVIS_OS_NAME', False) == 'linux':
             from xvfbwrapper import Xvfb  # virtual X server for plots under headless LINUX travis testing is needed
             cls.vdisplay = Xvfb()
             cls.vdisplay.start()

diff --git a/testbeam_analysis/testing/test_result_analysis.py b/testbeam_analysis/testing/test_result_analysis.py
@@ -14,7 +14,8 @@ class TestResultAnalysis(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        if os.getenv('TRAVIS', False):
+        # virtual X server for plots under headless LINUX travis testing is needed
+        if os.getenv('TRAVIS', False) and os.getenv('TRAVIS_OS_NAME', False) == 'linux':
             from xvfbwrapper import Xvfb  # virtual X server for plots under headless LINUX travis testing is needed
             cls.vdisplay = Xvfb()
             cls.vdisplay.start()

diff --git a/testbeam_analysis/testing/test_simulation.py b/testbeam_analysis/testing/test_simulation.py
@@ -18,9 +18,8 @@ class TestHitAnalysis(unittest.TestCase):
 
     @classmethod
     def setUpClass(self):
-        if os.getenv('TRAVIS', False):
-            # virtual X server for plots under headless LINUX travis testing is
-            # needed
+        # virtual X server for plots under headless LINUX travis testing is needed
+        if os.getenv('TRAVIS', False) and os.getenv('TRAVIS_OS_NAME', False) == 'linux':
             from xvfbwrapper import Xvfb
             self.vdisplay = Xvfb()
             self.vdisplay.start()

diff --git a/testbeam_analysis/testing/test_track_analysis.py b/testbeam_analysis/testing/test_track_analysis.py
@@ -14,8 +14,8 @@ class TestTrackAnalysis(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        if os.getenv('TRAVIS', False):
-            from xvfbwrapper import Xvfb  # virtual X server for plots under headless LINUX travis testing is needed
+        # virtual X server for plots under headless LINUX travis testing is needed
+        if os.getenv('TRAVIS', False) and os.getenv('TRAVIS_OS_NAME', False) == 'linux':
             cls.vdisplay = Xvfb()
             cls.vdisplay.start()
         cls.output_folder = 'tmp_track_test_output'