Commit 183fce37 by Ben Patterson

Merge pull request #10508 from edx/benp/bokchoy_default_store_envvar

Allow bok-choy default_store to be controlled by env vars.
parents 947538bb 634d0ffd
...@@ -63,7 +63,7 @@ def test_bokchoy(options): ...@@ -63,7 +63,7 @@ def test_bokchoy(options):
'fasttest': getattr(options, 'fasttest', False), 'fasttest': getattr(options, 'fasttest', False),
'serversonly': getattr(options, 'serversonly', False), 'serversonly': getattr(options, 'serversonly', False),
'testsonly': getattr(options, 'testsonly', False), 'testsonly': getattr(options, 'testsonly', False),
'default_store': getattr(options, 'default_store', 'split'), 'default_store': getattr(options, 'default_store', os.environ.get('DEFAULT_STORE', 'split')),
'verbosity': getattr(options, 'verbosity', 2), 'verbosity': getattr(options, 'verbosity', 2),
'extra_args': getattr(options, 'extra_args', ''), 'extra_args': getattr(options, 'extra_args', ''),
'pdb': getattr(options, 'pdb', False), 'pdb': getattr(options, 'pdb', False),
...@@ -90,7 +90,7 @@ def perf_report_bokchoy(options): ...@@ -90,7 +90,7 @@ def perf_report_bokchoy(options):
opts = { opts = {
'test_spec': getattr(options, 'test_spec', None), 'test_spec': getattr(options, 'test_spec', None),
'fasttest': getattr(options, 'fasttest', False), 'fasttest': getattr(options, 'fasttest', False),
'default_store': getattr(options, 'default_store', 'split'), 'default_store': getattr(options, 'default_store', os.environ.get('DEFAULT_STORE', 'split')),
'imports_dir': getattr(options, 'imports_dir', None), 'imports_dir': getattr(options, 'imports_dir', None),
'verbosity': getattr(options, 'verbosity', 2), 'verbosity': getattr(options, 'verbosity', 2),
'test_dir': 'performance', 'test_dir': 'performance',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment