| Message ID | 1459342697-1041-3-git-send-email-msuraev@sysmocom.de |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Mar 30, 2016 at 02:58:16PM +0200, msuraev@sysmocom.de wrote: > From: Max <msuraev@sysmocom.de> > > This attribute in osmoappdesc.py allows to ignore certain configs while > running vty tests. It's handy for hardware-specific or otherwise special > configuration examples. > --- > osmopy/osmotestconfig.py | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/osmopy/osmotestconfig.py b/osmopy/osmotestconfig.py > index ce47cf3..808048d 100644 > --- a/osmopy/osmotestconfig.py > +++ b/osmopy/osmotestconfig.py [...] > @@ -155,8 +155,8 @@ def check_configs_tested(basedir, app_configs): > > > def test_all_apps(apps, app_configs, tmpdir="writtenconfig", verbose=True, > - confpath=".", rmtmp=False): > - check_configs_tested("doc/examples/", app_configs) > + confpath=".", rmtmp=False, ignore_configs=[]): > + check_configs_tested("doc/examples/", app_configs, ignore_configs) > errors = 0 > for app in apps: > if not app_exists(app): > @@ -202,10 +202,11 @@ if __name__ == '__main__': > > apps = osmoappdesc.apps > configs = osmoappdesc.app_configs > + ignores = getattr(osmoappdesc, 'ignore_configs', []) > > if args.e1nitb: > configs['nitb'].extend(osmoappdesc.nitb_e1_configs) > > os.chdir(workdir) > - sys.exit(test_all_apps(apps, configs, confpath=confpath, > - verbose=args.verbose)) > + sys.exit(test_all_apps(apps, configs, ignore_configs=ignores, > + confpath=confpath, verbose=args.verbose)) would have been slightly more beautiful to put ignore_configs at the end like in the def above, and would have made for a slightly smaller diff, too... but whatever. ~Neels
diff --git a/osmopy/osmotestconfig.py b/osmopy/osmotestconfig.py index ce47cf3..808048d 100644 --- a/osmopy/osmotestconfig.py +++ b/osmopy/osmotestconfig.py @@ -139,11 +139,11 @@ def remove_tmpdir(tmpdir): os.rmdir(tmpdir) -def check_configs_tested(basedir, app_configs): +def check_configs_tested(basedir, app_configs, ignore_configs): configs = [] for root, dirs, files in os.walk(basedir): for f in files: - if f.endswith(".cfg"): + if f.endswith(".cfg") and f not in ignore_configs: configs.append(os.path.join(root, f)) for config in configs: found = False @@ -155,8 +155,8 @@ def check_configs_tested(basedir, app_configs): def test_all_apps(apps, app_configs, tmpdir="writtenconfig", verbose=True, - confpath=".", rmtmp=False): - check_configs_tested("doc/examples/", app_configs) + confpath=".", rmtmp=False, ignore_configs=[]): + check_configs_tested("doc/examples/", app_configs, ignore_configs) errors = 0 for app in apps: if not app_exists(app): @@ -202,10 +202,11 @@ if __name__ == '__main__': apps = osmoappdesc.apps configs = osmoappdesc.app_configs + ignores = getattr(osmoappdesc, 'ignore_configs', []) if args.e1nitb: configs['nitb'].extend(osmoappdesc.nitb_e1_configs) os.chdir(workdir) - sys.exit(test_all_apps(apps, configs, confpath=confpath, - verbose=args.verbose)) + sys.exit(test_all_apps(apps, configs, ignore_configs=ignores, + confpath=confpath, verbose=args.verbose))
From: Max <msuraev@sysmocom.de> This attribute in osmoappdesc.py allows to ignore certain configs while running vty tests. It's handy for hardware-specific or otherwise special configuration examples. --- osmopy/osmotestconfig.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)