Merge pull request #213 from Canadian-Light-Source/pytest_fail

fixed errors from pytest
paulscherrerinstitute · Apr 8, 2024 · 3b6d8d8 · 3b6d8d8
2 parents 8fca621 + b89b118
commit 3b6d8d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/scripts/jinja2/ecmcYamlHandler.py b/scripts/jinja2/ecmcYamlHandler.py
@@ -92,12 +92,6 @@ def checkForPlcFile(self):
         except KeyError:
             self.hasPlcFile = False
 
-        # Above will not catch error if wrong filename is set in plc.file
-        if 'plc' in self.yamlData.keys():
-            if 'file' in self.yamlData['plc'].keys():
-                if not len(self.hasPlcFile and self.yamlData['plc']['file']) > 0:
-                    raise FileNotFoundError("File not found: " + str(plc_file))
-
     def getAxisType(self, type_=None):
         if type_ is None:
             try:

diff --git a/scripts/jinja2/pytest/test_ecmcAxes.py b/scripts/jinja2/pytest/test_ecmcAxes.py
@@ -1,12 +1,15 @@
+import sys  
 import pytest
 import re
-from ecmcAxes import EcmcAxis
 
 base_path = 'scripts/jinja2/'
 templates_path = f'{base_path}templates/'
 yaml_path = f'{base_path}pytest/yaml_files/'
 ref_path = f'{base_path}pytest/reference_files/'
 
+sys.path.append(base_path)
+from ecmcAxes import EcmcAxis
+
 @pytest.mark.dependency()
 def test_init():
     with pytest.raises(TypeError):