From 6d8fe145d59fb59e268f2902ae23263da4632f47 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 2 Nov 2018 11:50:11 +0100 Subject: [PATCH] Adapt usertools tests to new syntax --- cscs-checks/system/slurm/cscs_usertools.py | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/cscs-checks/system/slurm/cscs_usertools.py b/cscs-checks/system/slurm/cscs_usertools.py index cfb449d132..56d8cdbba1 100644 --- a/cscs-checks/system/slurm/cscs_usertools.py +++ b/cscs-checks/system/slurm/cscs_usertools.py @@ -1,13 +1,13 @@ import os -import reframe.utility.sanity as sn -from reframe.core.pipeline import RunOnlyRegressionTest +import reframe as rfm +import reframe.utility.sanity as sn -class SbucheckCommandCheck(RunOnlyRegressionTest): - def __init__(self, **kwargs): - super().__init__('slurm_cscs_usertools_sbucheck', - os.path.dirname(__file__), **kwargs) +@rfm.simple_test +class SbucheckCommandCheck(rfm.RunOnlyRegressionTest): + def __init__(self): + super().__init__() self.valid_systems = ['daint:login', 'dom:login'] self.descr = 'Slurm CSCS usertools sbucheck' self.executable = 'sbucheck' @@ -21,10 +21,10 @@ def __init__(self, **kwargs): self.maintainers = ['VK'] -class MonthlyUsageCheck(RunOnlyRegressionTest): - def __init__(self, **kwargs): - super().__init__('slurm_cscs_usertools_monthly_usage', - os.path.dirname(__file__), **kwargs) +@rfm.simple_test +class MonthlyUsageCheck(rfm.RunOnlyRegressionTest): + def __init__(self): + super().__init__() self.valid_systems = ['daint:login', 'dom:login'] self.descr = 'Slurm CSCS usertools monthly_usage' self.executable = 'monthly_usage' @@ -36,7 +36,3 @@ def __init__(self, **kwargs): self.sanity_patterns = sn.assert_found( r'Usage in Node hours for the Crays', self.stdout) self.maintainers = ['VK'] - - -def _get_checks(**kwargs): - return [SbucheckCommandCheck(**kwargs), MonthlyUsageCheck(**kwargs)]