Revert commits on wrong branch

Author: hwikle-lanl

lib/pavilion/errors.py

@@ -322,6 +322,3 @@ class TestGroupError(PavilionError):
 
 class LockfileError(PavilionError):
     """Errors relating to lockfiles."""
-
-class SchedConfigError(PavilionError):
-    """Raised when there's a problem with the scheduler configuration."""

lib/pavilion/resolver/proto_test.py

@@ -329,7 +329,6 @@ def _permute_sched(self, var_man, used_per_vars) -> List[variables.VariableSetMa
 
         sched_name = self.config['scheduler']
         sched = schedulers.get_plugin(sched_name)
-        test_name = self.config.get('name', '<no name>')
 
         # Resolve the variables that don't depend on sched, but have complicated relationships
         # we couldn't solve iteratively. If there's anything left at this point, it will

lib/pavilion/schedulers/config.py

@@ -261,6 +261,10 @@ def check_leaves(cls, elem):
             raise ValueError(elem)
 
 
+class SchedConfigError(ValueError):
+    """Raised when there's a problem with the scheduler configuration."""
+
+
 def min_int(name, min_val, required=True):
     """Return a callback that ensures the argument >= min_val. If not required,
     an empty value will return None."""
@@ -563,7 +567,7 @@ def _validate_config(config: Dict[str, str],
 
             except ValueError as err:
                 raise SchedConfigError("Config value for key '{}' had a validation "
-                                       "error.".format(key), prior_error=err)
+                                       "error.".format(key), err)
 
         elif isinstance(validator, (tuple, list)):
             if value not in validator: