commit 9bb2913035c1c4e786a5cdd76c46a1c03191642a Author: Matt Traudt <sirm...@ksu.edu> Date: Wed Jul 4 12:02:23 2018 -0400
s/DEBUG/debug/ --- tests/integration/conftest.py | 2 +- tests/integration/core/test_scanner.py | 2 +- tests/integration/lib/test_relayprioritizer.py | 2 +- tests/unit/conftest.py | 2 +- tests/unit/core/test_cleanup.py | 20 ++++++++++---------- tests/unit/core/test_stats.py | 12 ++++++------ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 94b2433..cfd0e28 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -19,7 +19,7 @@ def persistent_empty_dotsbws(parser): ''' d = TemporaryDirectory() args = parser.parse_args( - '-d {} --log-level DEBUG init'.format(d.name).split()) + '-d {} --log-level debug init'.format(d.name).split()) conf = get_config(args) sbws.core.init.main(args, conf) os.makedirs(os.path.join(d.name, 'datadir')) diff --git a/tests/integration/core/test_scanner.py b/tests/integration/core/test_scanner.py index 152e939..e7e0d86 100644 --- a/tests/integration/core/test_scanner.py +++ b/tests/integration/core/test_scanner.py @@ -22,7 +22,7 @@ def assert_within(value, target, radius): def get_everything_to_measure(dotsbws, cont, parser): args = parser.parse_args( - '-d {} --log-level DEBUG scanner'.format(dotsbws).split()) + '-d {} --log-level debug scanner'.format(dotsbws).split()) conf = get_config(args) conf['destinations']['foo'] = 'on' conf['destinations.foo'] = {} diff --git a/tests/integration/lib/test_relayprioritizer.py b/tests/integration/lib/test_relayprioritizer.py index 237a139..d626fe0 100644 --- a/tests/integration/lib/test_relayprioritizer.py +++ b/tests/integration/lib/test_relayprioritizer.py @@ -14,7 +14,7 @@ def static_time(value): def get_global_stuff(dotsbws, cont, parser): args = parser.parse_args( - '-d {} --log-level DEBUG'.format(dotsbws).split()) + '-d {} --log-level debug'.format(dotsbws).split()) conf = get_config(args) rl = RelayList(args, conf, cont) return { diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 002987c..8915669 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -95,7 +95,7 @@ def empty_dotsbws(parser): ''' d = TemporaryDirectory() args = parser.parse_args( - '-d {} --log-level DEBUG init'.format(d.name).split()) + '-d {} --log-level debug init'.format(d.name).split()) conf = get_config(args) sbws.core.init.main(args, conf) return d diff --git a/tests/unit/core/test_cleanup.py b/tests/unit/core/test_cleanup.py index 0f6fc41..3278e00 100644 --- a/tests/unit/core/test_cleanup.py +++ b/tests/unit/core/test_cleanup.py @@ -13,7 +13,7 @@ def test_cleanup_no_dotsbws(tmpdir, caplog, parser): caplog.set_level(logging.DEBUG) dotsbws = tmpdir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws).split()) + '-d {} --log-level debug cleanup'.format(dotsbws).split()) conf = get_config(args) try: sbws.core.cleanup.main(args, conf) @@ -27,7 +27,7 @@ def test_cleanup_no_dotsbws(tmpdir, caplog, parser): def test_cleanup_no_datadir(empty_dotsbws, caplog, parser): dotsbws = empty_dotsbws args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) try: sbws.core.cleanup.main(args, conf) @@ -42,7 +42,7 @@ def test_cleanup_no_datadir(empty_dotsbws, caplog, parser): def test_cleanup_small_stale(empty_dotsbws_datadir, caplog, parser): dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) conf['general']['data_period'] = '1' conf['cleanup']['stale_days'] = '2' @@ -60,7 +60,7 @@ def test_cleanup_small_stale(empty_dotsbws_datadir, caplog, parser): def test_cleanup_small_rotten(empty_dotsbws_datadir, caplog, parser): dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) conf['general']['data_period'] = '1' conf['cleanup']['stale_days'] = '5' @@ -78,7 +78,7 @@ def test_cleanup_small_rotten(empty_dotsbws_datadir, caplog, parser): def test_cleanup_medium_stale(empty_dotsbws_datadir, caplog, parser): dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) conf['general']['data_period'] = '10' conf['cleanup']['stale_days'] = '19' @@ -94,7 +94,7 @@ def test_cleanup_only_compress_stale(time_mock, empty_dotsbws_datadir, caplog, caplog.set_level(logging.DEBUG) dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) conf['general']['data_period'] = '1' conf['cleanup']['stale_days'] = '10' @@ -140,7 +140,7 @@ def test_cleanup_only_delete_rotten(time_mock, empty_dotsbws_datadir, caplog, caplog.set_level(logging.DEBUG) dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) conf['general']['data_period'] = '1' conf['cleanup']['stale_days'] = '10' @@ -188,7 +188,7 @@ def test_cleanup_nothing_to_do(empty_dotsbws_datadir, caplog, parser): caplog.set_level(logging.DEBUG) dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) try: sbws.core.cleanup.main(args, conf) @@ -203,7 +203,7 @@ def test_cleanup_compress_barely_stale(time_mock, empty_dotsbws_datadir, caplog.set_level(logging.DEBUG) dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) conf['general']['data_period'] = '1' conf['cleanup']['stale_days'] = '10' @@ -239,7 +239,7 @@ def test_cleanup_delete_barely_rotten(time_mock, empty_dotsbws_datadir, caplog.set_level(logging.DEBUG) dotsbws = empty_dotsbws_datadir args = parser.parse_args( - '-d {} --log-level DEBUG cleanup'.format(dotsbws.name).split()) + '-d {} --log-level debug cleanup'.format(dotsbws.name).split()) conf = get_config(args) conf['general']['data_period'] = '1' conf['cleanup']['stale_days'] = '5' diff --git a/tests/unit/core/test_stats.py b/tests/unit/core/test_stats.py index 9554b16..4bac862 100644 --- a/tests/unit/core/test_stats.py +++ b/tests/unit/core/test_stats.py @@ -18,7 +18,7 @@ import logging def init_directory(dname): p = create_parser() - args = p.parse_args('-d {} --log-level DEBUG init'.format(dname).split()) + args = p.parse_args('-d {} --log-level debug init'.format(dname).split()) conf = get_config(args) sbws.core.init.main(args, conf) @@ -64,7 +64,7 @@ def test_stats_uninitted(tmpdir, caplog): An un-initialized .sbws directory should fail hard and exit immediately ''' p = create_parser() - args = p.parse_args('-d {} --log-level DEBUG stats'.format(tmpdir).split()) + args = p.parse_args('-d {} --log-level debug stats'.format(tmpdir).split()) conf = get_config(args) try: sbws.core.stats.main(args, conf) @@ -83,7 +83,7 @@ def test_stats_initted(tmpdir, caplog): ''' init_directory(tmpdir) p = create_parser() - args = p.parse_args('-d {} --log-level DEBUG stats'.format(tmpdir).split()) + args = p.parse_args('-d {} --log-level debug stats'.format(tmpdir).split()) conf = get_config(args) try: sbws.core.stats.main(args, conf) @@ -103,7 +103,7 @@ def test_stats_stale_result(tmpdir, caplog): init_directory(tmpdir) add_single_stale_result(tmpdir) p = create_parser() - args = p.parse_args('-d {} --log-level DEBUG stats'.format(tmpdir).split()) + args = p.parse_args('-d {} --log-level debug stats'.format(tmpdir).split()) conf = get_config(args) sbws.core.stats.main(args, conf) assert 'No fresh results' == caplog.records[-1].getMessage() @@ -121,7 +121,7 @@ def test_stats_fresh_result(tmpdir, capsys, caplog): add_single_fresh_result(tmpdir) p = create_parser() args = p.parse_args( - '-d {} --log-level DEBUG stats --error-types'.format(tmpdir).split()) + '-d {} --log-level debug stats --error-types'.format(tmpdir).split()) conf = get_config(args) sbws.core.stats.main(args, conf) captured = capsys.readouterr() @@ -158,7 +158,7 @@ def test_stats_fresh_results(time_mock, tmpdir, capsys, caplog): add_two_fresh_results(tmpdir, start-1) p = create_parser() args = p.parse_args( - '-d {} --log-level DEBUG stats --error-types'.format(tmpdir).split()) + '-d {} --log-level debug stats --error-types'.format(tmpdir).split()) conf = get_config(args) sbws.core.stats.main(args, conf) needed_output_lines = [ _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits