diff options
| -rw-r--r-- | tools/bench_pictures.cfg | 10 | ||||
| -rw-r--r-- | tools/tests/bench_pictures_cfg_test.py | 26 |
2 files changed, 23 insertions, 13 deletions
diff --git a/tools/bench_pictures.cfg b/tools/bench_pictures.cfg index 116582d3e2..ca06a7ab6d 100644 --- a/tools/bench_pictures.cfg +++ b/tools/bench_pictures.cfg @@ -55,12 +55,12 @@ default_configs = [ TiledBitmapConfig(1024, 64), # Different bounding box heirarchies, for different modes. - RecordRTreeConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y), + RecordRTreeConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y), + RecordGridConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y), PlaybackCreationRTreeConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y), - TileRTreeConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y), - RecordGridConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y), - PlaybackCreationGridConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y), - TileGridConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y), + PlaybackCreationGridConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y), + TileRTreeConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y), + TileGridConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y), ] diff --git a/tools/tests/bench_pictures_cfg_test.py b/tools/tests/bench_pictures_cfg_test.py index 1913e4208c..77ad553b28 100644 --- a/tools/tests/bench_pictures_cfg_test.py +++ b/tools/tests/bench_pictures_cfg_test.py @@ -12,25 +12,35 @@ import os import sys +def ThrowIfNotAString(obj): + """ Raise a TypeError if obj is not a string. """ + if str(obj) != obj: + raise TypeError('%s is not a string!' % str(obj)) + + def Main(argv): + """ Verify that the bench_pictures.cfg file is sane. + + - Exec the file to ensure that it uses correct Python syntax. + - Make sure that every element is a string, because the buildbot scripts will + fail to execute if this is not the case. + + This test does not verify that the well-formed configs are actually valid. + """ vars = {'import_path': 'tools'} execfile(os.path.join('tools', 'bench_pictures.cfg'), vars) bench_pictures_cfg = vars['bench_pictures_cfg'] for config_name, config_list in bench_pictures_cfg.iteritems(): - if str(config_name) != config_name: - raise TypeError('%s is not a string!' % str(config_name)) + ThrowIfNotAString(config_name) for config in config_list: for key, value in config.iteritems(): - if str(key) != key: - raise TypeError('%s is not a string!\n%s' % (str(key), config)) + ThrowIfNotAString(key) if type(value).__name__ == 'list': for item in value: - if str(item) != item: - raise TypeError('%s is not a string!\n%s' % (str(item), config)) + ThrowIfNotAString(item) else: - if str(value) != value: - raise TypeError('%s is not a string!\n%s' % (str(value), config)) + ThrowIfNotAString(value) if __name__ == '__main__': sys.exit(Main(sys.argv))
\ No newline at end of file |