September 2018 - tor-commits - lists.torproject.org

[sbws/master] Add cli args to filter results
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 52488eae1a22e112f1317241ca6d40ab17103c2e Author: juga0 <juga(a)riseup.net> Date: Wed Sep 5 12:43:21 2018 +0000 Add cli args to filter results when generating bw files --- sbws/core/generate.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 4f80bb9..20ccbfe 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -49,6 +49,16 @@ def gen_parser(sub): type=int, help="Number of most significant digits to round bw " "when scaling as Torflow. (Default: 3)") + p.add_argument('-p', '--secs-recent', default=None, + help="How many secs in the past are results being " + "still considered. Note this value will supersede " + "data_period in the configuration. (Default: None)") + p.add_argument('-a', '--secs-away', default=DAY_SECS, + help="How many secs results have to be away from each " + "other. (Default: 86400 - one day -)") + p.add_argument('-n', '--min-num', default=NUM_MIN_RESULTS, + help="Mininum number of a results to consider them." + "(Default: 2)") def main(args, conf):

1 0

[sbws/master] Merge pull request #256 from juga0/27338_filter_results
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 36ca11c0891787c8e76ccaba39387dc5d5c92e6f Merge: 0c5415d abe7947 Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 19:15:25 2018 +0000 Merge pull request #256 from juga0/27338_filter_results 27338 filter results CHANGELOG.md | 5 ++ docs/source/conf.py | 2 + sbws/core/generate.py | 18 +++++- sbws/globals.py | 2 + sbws/lib/v3bwfile.py | 132 +++++++++++++++++++++++++++------------- sbws/util/timestamp.py | 4 ++ tests/unit/lib/test_v3bwfile.py | 10 ++- 7 files changed, 127 insertions(+), 46 deletions(-)

1 0

[sbws/master] Change var names in equation
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit c9ff4ac13c885990995f40da1facd620b23d4974 Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 15:39:29 2018 +0000 Change var names in equation --- sbws/lib/v3bwfile.py | 68 +++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index a7a4991..afed0b1 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -674,7 +674,6 @@ class V3BWFile(object): n.new_bw = n.desc_bw*n.ratio The descriptor observed bandwidth is multiplied by the ratio. - With empirical results this ratio is ~[0.9, 8.9] **Limit the bandwidth to a maximum**:: @@ -696,36 +695,45 @@ class V3BWFile(object): All of that can be expressed as: .. math:: + :label:torflow_bwn_eq - bwnew_i &= - max\\left( - \\frac{bw_i}{\\mu}, - min \\left( - bw_i, - bw_i \\times \\mu - \\right) - \\times - \\frac{bw}{\\sum_{i=1}^{n} - min \\left(bw_i, - bw_i \\times \\mu - \\right)} - \\right) - \\times bwdescobs_i \\ - - &= - max\\left( - \\frac{bw_i}{\\frac{\\sum_{i=1}^{n}bw_i}{n}}, - min \\left( - bw_i, - bw_i \\times \\frac{\\sum_{i=1}^{n}bw_i}{n} - \\right) - \\times - \\frac{bw}{\\sum_{i=1}^{n} - min \\left(bw_i, - bw_i \\times \\frac{\\sum_{i=1}^{n}bw_i}{n} - \\right)} - \\right) - \\times bwdescobs_i + bwn_i =& + max\left( + \frac{bw_i}{\mu}, + \frac{bwf_i}{\mu_{bwf}} + \right) + \times bwobs_i\\ + + .. math:: + + bwn_i =& + max\left( + \frac{bw_i}{\mu}, + min \left( + bw_i, + bw_i \times \mu + \right) + \times + \frac{bw}{\sum_{i=1}^{n} + min \left(bw_i, + bw_i \times \mu + \right)} + \right) + \times bwobs_i \\ + =& + max\left( + \frac{bw_i}{\frac{\sum_{i=1}^{n}bw_i}{n}}, + min \left( + bw_i, + bw_i \times \frac{\sum_{i=1}^{n}bw_i}{n} + \right) + \times + \frac{bw}{\sum_{i=1}^{n} + min \left(bw_i, + bw_i \times \frac{\sum_{i=1}^{n}bw_i}{n} + \right)} + \right) + \times bwobs_i """ log.info("Calculating relays' bandwidth using Torflow method.")

1 0

[sbws/master] Stop using dir as arg in integration tests
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit de5a7e96190451c8b9f00ad91493d48af634aece Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 20:05:46 2018 +0000 Stop using dir as arg in integration tests --- tests/integration/conftest.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 4b31f8c..7e1b727 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -50,9 +50,16 @@ def sbwshome_dir(sbwshome_empty): @pytest.fixture(scope='session') -def args(sbwshome_dir, parser): +def test_config_path(tmpdir): + """""" + config = tmpdir.join('.sbws.ini') + return config + + +(a)pytest.fixture(scope='session') +def args(sbwshome_empty, parser, test_config_path): """Args with sbws home in the tests tmp dir.""" - args = _PseudoArguments(directory=sbwshome_dir, output=sbwshome_dir, + args = _PseudoArguments(config=test_config_path, output=sbwshome_empty, scale=False, log_level='debug') return args

1 0

[sbws/master] Enable ext to convert latex math to img
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit b5c3f11f65b4f07e8d5a3acef8d289bc71726d19 Author: juga0 <juga(a)riseup.net> Date: Wed Sep 5 12:46:38 2018 +0000 Enable ext to convert latex math to img also enable intersphinx --- docs/source/conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/conf.py b/docs/source/conf.py index 5e260d4..d65a209 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -48,6 +48,8 @@ extensions = [ 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.githubpages', + 'sphinx.ext.imgmath', + 'sphinx.ext.intersphinx' ] # Add any paths that contain templates here, relative to this directory.

1 0

[sbws/master] Merge pull request #257 from juga0/fix_import
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit b6c480eba2eed7a9bf15a63d6c1f2d162eefd25f Merge: 36ca11c 37cc9a4 Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 19:43:44 2018 +0000 Merge pull request #257 from juga0/fix_import Add forgotten constant import tests/unit/lib/test_v3bwfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[sbws/master] Generate bw file filtering results
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit fd902af15c68a88f4993bd9e3da2beed183c5f8b Author: juga0 <juga(a)riseup.net> Date: Wed Sep 5 12:45:04 2018 +0000 Generate bw file filtering results --- sbws/core/generate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 20ccbfe..6d91690 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -93,7 +93,10 @@ def main(args, conf): bw_file = V3BWFile.from_results(results, state_fpath, args.scale_constant, scaling_method, torflow_cap=args.torflow_bw_margin, - torflow_round_digs=args.torflow_round_digs) + torflow_round_digs=args.torflow_round_digs, + secs_recent=args.secs_recent, + secs_away=args.secs_away, + min_num=args.min_num) output = args.output or \ conf.getpath('paths', 'v3bw_fname').format(now_fname()) bw_file.write(output)

1 0

[sbws/master] Add forgotten constant import
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 37cc9a4f7bfafb06085004b6934ce2867f381827 Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 19:27:27 2018 +0000 Add forgotten constant import --- tests/unit/lib/test_v3bwfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index b0001c1..15a6779 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -4,7 +4,7 @@ import json import os.path from sbws import __version__ as version -from sbws.globals import SPEC_VERSION, SBWS_SCALING +from sbws.globals import SPEC_VERSION, SBWS_SCALING, TORFLOW_SCALING from sbws.lib.resultdump import Result, load_result_file from sbws.lib.v3bwfile import (V3BWHeader, V3BWLine, TERMINATOR, LINE_SEP, KEYVALUE_SEP_V110, num_results_of_type,

1 0

[sbws/master] Merge pull request #258 from juga0/ticket27342_test_args
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 835e98d913fdea3461a20b0af7a1d88c8604bf9a Merge: b6c480e 1447b22 Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 20:11:11 2018 +0000 Merge pull request #258 from juga0/ticket27342_test_args Ticket27342 test args CHANGELOG.md | 1 + tests/integration/conftest.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[sbws/master] Add changelog entry about integration tests dir
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 1447b227ca8ac832cd0dd16459a2e949e8e7c218 Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 20:08:43 2018 +0000 Add changelog entry about integration tests dir --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9297a8..d252001 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Broken environment variable in default sbws config. To use envvar $FOO, write $$FOO in the config. +- Stop using directory as argument in integration tests (#27342) ### Changed

1 0