lexer: handle different template values correctly

yanne · yanne · commit d09436b74fbe · 2019-05-30T19:01:25.000+03:00
diff --git a/src/robot/parsing/lexer/settings.py b/src/robot/parsing/lexer/settings.py
@@ -112,9 +112,19 @@ def _format_name(self, name):
 
     @property
     def template_set(self):
-        # FIXME: Should look at the values as well
-        return (self.settings['TEMPLATE'] or
-                self.parent.settings['TEST TEMPLATE'])
+        test_template = self.settings['TEMPLATE']
+        if self._has_override_value(test_template):
+            return False
+        parent_template = self.parent.settings['TEST TEMPLATE']
+        return self._has_value(test_template) or self._has_value(parent_template)
+
+    def _has_override_value(self, template):
+        if template is None:
+            return False
+        return template == [] or template[0].value.upper() == 'NONE'
+
+    def _has_value(self, template):
+        return template and template[0].value
 
 
 class KeywordSettings(Settings):
