Removing duplicate functionality.

Author: kraigher

vunit/test/common.py

@@ -10,38 +10,20 @@
 
 
 from xml.etree import ElementTree
-from vunit.modelsim_interface import ModelSimInterface
-from os import environ
-
-SIMULATORS = [ModelSimInterface]
-
-
-def _get_simulator_to_use():
-    """
-    Return the class of the simulator to use
-    """
-    key = "VUNIT_SIMULATOR"
-    if key in environ:
-        for sim in SIMULATORS:
-            if sim.name == environ[key]:
-                return sim
-    else:
-        return SIMULATORS[0]
-    assert False
+from vunit import VUnit
 
 
 def has_simulator():
-    return _get_simulator_to_use().is_available()
+    return VUnit.select_simulator().is_available()
 
 
 def simulator_is(*names):
     """
     Check that current simulator is any of names
     """
-    simulator_names = [sim.name for sim in SIMULATORS]
     for name in names:
-        assert name in simulator_names
-    return _get_simulator_to_use().name in names
+        assert name in VUnit.available_simulators()
+    return VUnit.select_simulator().name in names
 
 
 def check_report(report_file, tests):

vunit/ui.py

@@ -78,7 +78,7 @@ def test_filter(name):
                    gui_mode=args.gui,
                    compile_builtins=compile_builtins,
                    persistent_sim=os.environ.get("VUNIT_PERSISTENT_SIM", "True") == "True",
-                   simulator_class=cls._select_simulator())
+                   simulator_class=cls.select_simulator())
 
     @classmethod
     def _create_argument_parser(cls):
@@ -141,7 +141,7 @@ def _create_argument_parser(cls):
         return parser
 
     @staticmethod
-    def _available_simulators():
+    def available_simulators():
         """
         Return a list of available simulators
         """
@@ -154,12 +154,12 @@ def _available_simulators():
         return sims
 
     @classmethod
-    def _select_simulator(cls):
+    def select_simulator(cls):
         """
         Select simulator class, either from VUNIT_SIMULATOR environment variable
         or the first available
         """
-        simulators = cls._available_simulators()
+        simulators = cls.available_simulators()
         environ_name = "VUNIT_SIMULATOR"
 
         if environ_name in os.environ:
@@ -221,7 +221,7 @@ def __init__(self,  # pylint: disable=too-many-locals, too-many-arguments
         if simulator_class is not None:
             self._simulator_class = simulator_class
         else:
-            self._simulator_class = self._available_simulators().values()[0]
+            self._simulator_class = self.available_simulators().values()[0]
 
         self._sim_specific_path = join(self._output_path, self._simulator_class.name)
         self._create_output_path(clean)