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

[sbws/master] Check bw line size
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit c3f7b0482d902601eb02b3e3dee7e683e0e949d0 Author: juga0 <juga(a)riseup.net> Date: Sat May 26 19:23:44 2018 +0000 Check bw line size also, convert types to int when generating line from str --- sbws/globals.py | 1 + sbws/lib/v3bwfile.py | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index 602075a..a6621ab 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -25,6 +25,7 @@ TORRC_STARTING_POINT = { } SCALE_CONSTANT = 7500 +BW_LINE_SIZE = 510 def is_initted(d): diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index cb4a6af..2d7196a 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -6,7 +6,7 @@ import logging from statistics import median from sbws import __version__ -from sbws.globals import SPEC_VERSION +from sbws.globals import SPEC_VERSION, BW_LINE_SIZE from sbws.lib.resultdump import ResultSuccess, _ResultType from sbws.util.filelock import FileLock from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str @@ -32,7 +32,9 @@ LINE_TERMINATOR = TERMINATOR + LINE_SEP BW_KEYVALUE_SEP_V110 = ' ' BW_EXTRA_ARG_KEYVALUES = ['master_key_ed25519', 'nick', 'rtts', 'last_time', 'success', 'error_stream', 'error_circ', - 'error_misc', 'error_auth'] + 'error_misc'] +BW_KEYVALUES_INT = ['bw', 'rtts', 'success', 'error_auth', 'error_stream', + 'error_circ', 'error_misc'] BW_KEYVALUES = ['node_id', 'bw'] + BW_EXTRA_ARG_KEYVALUES @@ -278,6 +280,11 @@ class V3BWLine(object): """Return Bandwidth Line string following spec v1.1.0.""" bw_line_str = BW_KEYVALUE_SEP_V110.join( self.bw_keyvalue_v110str_ls) + LINE_SEP + if len(bw_line_str) > BW_LINE_SIZE: + # if this is the case, probably there are too many KeyValues, + # or the limit needs to be changed in Tor + log.warn("The bandwidth line %s is longer than %s", + len(bw_line_str), BW_LINE_SIZE) return bw_line_str def __str__(self): @@ -289,6 +296,9 @@ class V3BWLine(object): kwargs = dict([kv.split(KEYVALUE_SEP_V110) for kv in line.split(BW_KEYVALUE_SEP_V110) if kv.split(KEYVALUE_SEP_V110)[0] in BW_KEYVALUES]) + for k, v in kwargs.items(): + if k in BW_KEYVALUES_INT: + kwargs[k] = int(v) bw_line = cls(**kwargs) return bw_line

1 0

[sbws/master] Add doc for v3bw clasess
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit a1931c6b92b7efa82e5c8351c60cf649e1fe2467 Author: juga0 <juga(a)riseup.net> Date: Sat May 26 18:15:58 2018 +0000 Add doc for v3bw clasess also complete classes docstring --- docs/source/sbws.lib.rst | 7 +++++++ sbws/lib/v3bwfile.py | 40 +++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/docs/source/sbws.lib.rst b/docs/source/sbws.lib.rst index d837ab3..b9a4c13 100644 --- a/docs/source/sbws.lib.rst +++ b/docs/source/sbws.lib.rst @@ -36,6 +36,13 @@ sbws.lib.resultdump module :undoc-members: :show-inheritance: +sbws.lib.v3bwfile module +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. automodule:: sbws.lib.v3bwfile + :members: + :undoc-members: + :show-inheritance: Module contents --------------- diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index eef4216..cb4a6af 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -104,6 +104,7 @@ class V3BwHeader(object): :param str software: the name of the software that generates this :param str software_version: the version of the software :param dict kwargs: extra headers. Currently supported: + - earliest_bandwidth: str, ISO 8601 timestamp in UTC time zone when the first bandwidth was obtained - generator_started: str, ISO 8601 timestamp in UTC time zone @@ -231,20 +232,23 @@ class V3BwHeader(object): class V3BWLine(object): + """ + Create a Bandwidth List line following the spec version 1.1.0. + + :param str node_id: + :param int bw: + :param dict kwargs: extra headers. Currently supported: + + - nickname, str + - master_key_ed25519, str + - rtt, int + - time, str + - sucess, int + - error_stream, int + - error_circ, int + - error_misc, int + """ def __init__(self, node_id, bw, **kwargs): - """ - :param str node_id: - :param int bw: - Currently accepted KeyValues: - - nickname, str - - master_key_ed25519, str - - rtt, int - - time, str - - sucess, int - - error_stream, int - - error_circ, int - - error_misc, int - """ assert isinstance(node_id, str) assert isinstance(bw, int) self.node_id = node_id @@ -335,11 +339,13 @@ class V3BWLine(object): class V3BwFile(object): + """ + Create a Bandwidth List file following spec version 1.1.0 + + :param V3BWHeader v3bwheader: header + :param list v3bwlines: V3BWLines + """ def __init__(self, v3bwheader, v3bwlines): - """ - :param V3BWHeader v3bwheader: - :param list v3bwlines: - """ self.header = v3bwheader self.bw_lines = v3bwlines

1 0

[sbws/master] Use a file that obviously doesn't exist by default
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 245e93247792691d893ad23ce99d4680251372d9 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jun 6 21:39:42 2018 -0400 Use a file that obviously doesn't exist by default That way it will be obvious that sbws isn't really going to try to log to /nonexist and that sbws must set this option for real elsewhere. --- sbws/config.log.default.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/config.log.default.ini b/sbws/config.log.default.ini index 4294c6e..6c51326 100644 --- a/sbws/config.log.default.ini +++ b/sbws/config.log.default.ini @@ -60,4 +60,4 @@ formatter = sbwssys # which is the desired behaviour # dunno if there is a way to have log file as a variable # setting one as default -args = ('sbws.log',) +args = ('/nonexist',)

1 0

[sbws/master] Fix rtt and time names
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 001b7e5b7489295871f3fbbc32efadd502477941 Author: juga0 <juga(a)riseup.net> Date: Sat May 26 20:06:21 2018 +0000 Fix rtt and time names --- sbws/lib/v3bwfile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 2d7196a..ccb71c4 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -30,10 +30,10 @@ LINE_TERMINATOR = TERMINATOR + LINE_SEP # KeyValue separator in Bandwidth Lines BW_KEYVALUE_SEP_V110 = ' ' -BW_EXTRA_ARG_KEYVALUES = ['master_key_ed25519', 'nick', 'rtts', 'last_time', +BW_EXTRA_ARG_KEYVALUES = ['master_key_ed25519', 'nick', 'rtt', 'time', 'success', 'error_stream', 'error_circ', 'error_misc'] -BW_KEYVALUES_INT = ['bw', 'rtts', 'success', 'error_auth', 'error_stream', +BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_auth', 'error_stream', 'error_circ', 'error_misc'] BW_KEYVALUES = ['node_id', 'bw'] + BW_EXTRA_ARG_KEYVALUES @@ -315,7 +315,7 @@ class V3BWLine(object): return unixts_to_isodt_str(round(max([r.time for r in results]))) @staticmethod - def rtts_from_results(results): + def rtt_from_results(results): # convert from miliseconds to seconds rtts = [(round(rtt * 1000)) for r in results for rtt in r.rtts] rtt = round(median(rtts)) @@ -336,8 +336,8 @@ class V3BWLine(object): bw = cls.bw_from_results(success_results) kwargs = dict() kwargs['nick'] = results[0].nickname - kwargs['rtt'] = cls.rtts_from_results(success_results) - kwargs['last_time'] = cls.last_time_from_results(results) + kwargs['rtt'] = cls.rtt_from_results(success_results) + kwargs['time'] = cls.last_time_from_results(results) kwargs.update(cls.result_types_from_results(results)) bwl = cls(node_id, bw, **kwargs) return bwl

1 0

[sbws/master] Merge branch 'issue159' from juga, thanks!
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 78872b3ace0108fc7dbd32149ab5a9363c5faafe Merge: 8f5f590 8674d78 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jun 6 21:43:59 2018 -0400 Merge branch 'issue159' from juga, thanks! sbws/config.default.ini | 1 + sbws/config.log.default.ini | 23 +++++++++++++++++------ sbws/util/config.py | 6 +++++- 3 files changed, 23 insertions(+), 7 deletions(-)

1 0

[sbws/master] It's easier to tell what's going on with thread names
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit c353297f74621482abfcb600e626d4c2d18e4123 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jun 6 21:53:59 2018 -0400 It's easier to tell what's going on with thread names --- sbws/config.log.default.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/config.log.default.ini b/sbws/config.log.default.ini index 9bbe7aa..4bae7aa 100644 --- a/sbws/config.log.default.ini +++ b/sbws/config.log.default.ini @@ -37,7 +37,7 @@ level = DEBUG # verbose formatter useful for debugging [formatter_sbwsdebug] -format = %(asctime)s %(levelname)s %(thread)d %(filename)s:%(lineno)s - %(funcName)s - %(message)s +format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s datefmt = %Y-%m-%d %H:%M:%S # for logging to system log

1 0

[sbws/master] Add logging to a file by default, as well as stdout
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 149f4adad4734346a2fc9cba35841bb69ee6fffa Author: juga0 <juga(a)riseup.net> Date: Wed Jun 6 12:26:46 2018 +0000 Add logging to a file by default, as well as stdout --- sbws/config.default.ini | 1 + sbws/config.log.default.ini | 23 +++++++++++++++++------ sbws/util/config.py | 6 +++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index c9106e8..15ab014 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -2,6 +2,7 @@ datadir = ${sbws_home}/datadir v3bw_fname = ${sbws_home}/v3bw.txt started_filepath = ${sbws_home}/started_at +log_filepath = ${sbws_home}/sbws.log [destinations] # How often to check if a destional is usable diff --git a/sbws/config.log.default.ini b/sbws/config.log.default.ini index 1defe20..4294c6e 100644 --- a/sbws/config.log.default.ini +++ b/sbws/config.log.default.ini @@ -2,10 +2,10 @@ keys = root,sbws [handlers] -keys = sbwsdefault,sbwsdebug +keys = sbwsdefault,sbwsdebug,sbwsfile [formatters] -keys = sbwsdefault,sbwsdebug +keys = sbwsdefault,sbwsdebug,sbwssys [logger_root] level = WARNING @@ -15,13 +15,13 @@ qualname=root [logger_sbws] level = INFO -handlers = sbwsdefault +# add here sbwssys for also logging to system log +handlers = sbwsdefault,sbwsfile propagate = 0 qualname=sbws [handler_sbwsdefault] class = StreamHandler -# add here sbwsys for also logging to system log formatter = sbwsdefault args = (sys.stdout,) @@ -48,5 +48,16 @@ level = INFO # syslog-like formater [formatter_sbwssys] -format = %(module)s[%(process)s]: %(message)s -datefmt = %Y-%m-%d %H:%M:%S +# hostname should be added here with a context filter, dunno if there is a way +# to add it here +format = %(asctime)s %(module)s[%(process)s]: <%(levelname)s> %(message)s +datefmt = %b %d %H:%M:%S + +[handler_sbwsfile] +class = handlers.RotatingFileHandler +formatter = sbwssys +# when not using level, it seems to be using the one passed as cli arg, +# which is the desired behaviour +# dunno if there is a way to have log file as a variable +# setting one as default +args = ('sbws.log',) diff --git a/sbws/util/config.py b/sbws/util/config.py index 7bf73df..cdf8601 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -87,6 +87,10 @@ def get_user_example_config(): def configure_logging(conf): assert isinstance(conf, ConfigParser) + # log_filepath is not a variable in config.log.default.ini, + # so adding it here. Maybe there is a better way to do this + conf['handler_sbwsfile']['args'] = \ + "('{}',)".format(conf['paths']['log_filepath']) with NamedTemporaryFile('w+t') as fd: conf.write(fd) fd.seek(0, 0) @@ -146,7 +150,7 @@ def _validate_paths(conf): err_tmpl = Template('$sec/$key ($val): $e') unvalidated_keys = [ 'datadir', 'sbws_home', 'v3bw_fname', - 'started_filepath'] + 'started_filepath', 'log_filepath'] all_valid_keys = unvalidated_keys allow_missing = ['sbws_home'] errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl,

1 0

[sbws/master] Fix assertion if stem can't find a relay
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 88fae60bc7b420ca7f36f92b482401b8a7adebaf Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jun 6 20:43:42 2018 -0400 Fix assertion if stem can't find a relay 2018-06-06 04:42:03 ERROR Thread-5 scanner.py:225 - dispatch_worker_thread - Unhandled exception in worker thread Traceback (most recent call last): File "/home/pastly/src/simple-bw-scanner/sbws/core/scanner.py", line 223, in dispatch_worker_thread return measure_relay(*a, **kw) File "/home/pastly/src/simple-bw-scanner/sbws/core/scanner.py", line 138, in measure_relay dest = destinations.next() File "/home/pastly/src/simple-bw-scanner/sbws/lib/destination.py", line 222, in next self._perform_usability_test() File "/home/pastly/src/simple-bw-scanner/sbws/lib/destination.py", line 171, in _perform_usability_test circ_id = self._cb.build_circuit([None, exit.fingerprint]) File "/home/pastly/src/simple-bw-scanner/sbws/lib/circuitbuilder.py", line 175, in build_circuit for r in path] File "/home/pastly/src/simple-bw-scanner/sbws/lib/circuitbuilder.py", line 175, in <listcomp> for r in path] AttributeError: 'NoneType' object has no attribute 'fingerprint' 2018-06-06 04:42:03 ERROR Thread-10 scanner.py:280 - closure - Unhandled exception caught while measuring torbogen: <class 'AttributeError'> 'NoneType' object has no attribute 'fingerprint' --- sbws/lib/circuitbuilder.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index d7dbe90..ac5603b 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -147,8 +147,20 @@ class GapsCircuitBuilder(CircuitBuilder): continue chosen_fps.append(choice) black_fps.append(choice) - return [stem_utils.fp_or_nick_to_relay(self.controller, fp) - for fp in chosen_fps] + relays = [] + for fp in chosen_fps: + relay = stem_utils.fp_or_nick_to_relay(self.controller, fp) + if not relay: + log.warning( + 'We\'re selecting a handful of random relays and stem ' + 'doesn\'t think one of the fingerprints we gave it goes ' + 'to a relay. Maybe we got a new consensus since the last ' + 'time we refreshed our list of relays. In any case, we ' + 'could try to recover. But failing inside ' + '_random_sample_relays is easier. Sorry.') + return None + relays.append(relay) + return relays def build_circuit(self, path): ''' <path> is a list of relays and Falsey values. Relays can be

1 0

[sbws/master] Fix last_time by time and remove error_auth
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 7b1252d6fd517b9904527c7a732a722c4a1f0cff Author: juga0 <juga(a)riseup.net> Date: Sat May 26 20:24:13 2018 +0000 Fix last_time by time and remove error_auth --- sbws/lib/v3bwfile.py | 2 +- tests/lib/data/v3bw.txt | 2 +- tests/unit/core/test_generate.py | 24 ++++++++++++------------ tests/unit/lib/test_v3bwfile.py | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index ccb71c4..27476c6 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -33,7 +33,7 @@ BW_KEYVALUE_SEP_V110 = ' ' BW_EXTRA_ARG_KEYVALUES = ['master_key_ed25519', 'nick', 'rtt', 'time', 'success', 'error_stream', 'error_circ', 'error_misc'] -BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_auth', 'error_stream', +BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_stream', 'error_circ', 'error_misc'] BW_KEYVALUES = ['node_id', 'bw'] + BW_EXTRA_ARG_KEYVALUES diff --git a/tests/lib/data/v3bw.txt b/tests/lib/data/v3bw.txt index 09f4a6f..4ca416f 100644 --- a/tests/lib/data/v3bw.txt +++ b/tests/lib/data/v3bw.txt @@ -7,4 +7,4 @@ latest_bandwidth=2018-04-17T14:09:07 software=sbws software_version=0.3.1-dev ==== -bw=54 error_auth=0 error_circ=0 error_misc=0 error_stream=1 last_time=2018-04-17T14:09:07 nick=A node_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA success=1 +bw=54 error_circ=0 error_misc=0 error_stream=1 nick=A node_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 time=2018-04-17T14:09:07 diff --git a/tests/unit/core/test_generate.py b/tests/unit/core/test_generate.py index 8ec1fee..a26ca5e 100644 --- a/tests/unit/core/test_generate.py +++ b/tests/unit/core/test_generate.py @@ -121,8 +121,8 @@ def test_generate_single_success_noscale(dotsbws_success_result, caplog, for dl in result.downloads])) rtt = median([round(r * 1000) for r in result.rtts]) bw_line = V3BWLine(result.fingerprint, bw, nick=result.nickname, rtt=rtt, - last_time=unixts_to_isodt_str(round(result.time)), - success=1, error_circ=0, error_auth=0, error_misc=0, + time=unixts_to_isodt_str(round(result.time)), + success=1, error_circ=0, error_misc=0, error_stream=0) # bw_line = V3BWLine.from_results(results) print(stdout_lines) @@ -155,8 +155,8 @@ def test_generate_single_success_scale(dotsbws_success_result, parser, bw = 7500 rtt = median([round(r * 1000) for r in result.rtts]) bw_line = V3BWLine(result.fingerprint, bw, nick=result.nickname, rtt=rtt, - last_time=unixts_to_isodt_str(round(result.time)), - success=1, error_circ=0, error_auth=0, error_misc=0, + time=unixts_to_isodt_str(round(result.time)), + success=1, error_circ=0, error_misc=0, error_stream=0) assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) @@ -193,8 +193,8 @@ def test_generate_single_relay_success_noscale( unixts_to_isodt_str(round(result.time))) bw_line = V3BWLine(result.fingerprint, speed, nick=result.nickname, rtt=rtt, - last_time=unixts_to_isodt_str(round(result.time)), - success=2, error_circ=0, error_auth=0, error_misc=0, + time=unixts_to_isodt_str(round(result.time)), + success=2, error_circ=0, error_misc=0, error_stream=0) assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) @@ -226,8 +226,8 @@ def test_generate_single_relay_success_scale( rtt = round(median([round(r * 1000) for r in result.rtts])) bw_line = V3BWLine(result.fingerprint, speed, nick=result.nickname, rtt=rtt, - last_time=unixts_to_isodt_str(round(result.time)), - success=2, error_circ=0, error_auth=0, error_misc=0, + time=unixts_to_isodt_str(round(result.time)), + success=2, error_circ=0, error_misc=0, error_stream=0) assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) @@ -265,8 +265,8 @@ def test_generate_two_relays_success_noscale( r1_rtt = round(median([round(rtt * 1000) for r in r1_results for rtt in r.rtts])) bw_line = V3BWLine(r1_fingerprint, r1_speed, nick=r1_name, rtt=r1_rtt, - last_time=r1_time, - success=2, error_circ=0, error_auth=0, error_misc=0, + time=r1_time, + success=2, error_circ=0, error_misc=0, error_stream=0) assert stdout_lines[1 + NUM_LINES_HEADER_V110] + '\n' == str(bw_line) @@ -280,7 +280,7 @@ def test_generate_two_relays_success_noscale( r2_rtt = round(median([round(rtt * 1000) for r in r2_results for rtt in r.rtts])) bw_line = V3BWLine(r2_fingerprint, r2_speed, nick=r2_name, rtt=r2_rtt, - last_time=r2_time, - success=2, error_circ=0, error_auth=0, error_misc=0, + time=r2_time, + success=2, error_circ=0, error_misc=0, error_stream=0) assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 3127a92..f6fb51b 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -34,9 +34,10 @@ header_extra_ls = [timestamp_l, version_l, software_l, software_version_l, TERMINATOR] header_extra_str = LINE_SEP.join(header_extra_ls) + LINE_SEP -bwl_str = "bw=54 error_auth=0 error_circ=0 error_misc=0 error_stream=1 " \ - "last_time=2018-04-17T14:09:07 nick=A " \ - "node_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA success=1\n" +bwl_str = "bw=54 error_circ=0 error_misc=0 error_stream=1 " \ + "nick=A " \ + "node_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 " \ + "time=2018-04-17T14:09:07\n" v3bw_str = header_extra_str + bwl_str @@ -161,5 +162,4 @@ def test_v3bwfile(datadir, tmpdir): bwls = [V3BWLine.from_results(results[fp]) for fp in results] f = V3BwFile(header, bwls) # f = V3BwFile.from_results(None, str(tmpdir.join("v3bw.txt")), results) - assert v3bw == str(f)

1 0

[sbws/master] 'time' isn't always a program: sometimes it's a bash feature
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 8f5f590a4d1af216afd1fd2130c7465ed19e6b1f Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jun 6 20:48:07 2018 -0400 'time' isn't always a program: sometimes it's a bash feature --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 8d0b52e..5134fb4 100644 --- a/tox.ini +++ b/tox.ini @@ -22,11 +22,10 @@ deps = .[test] whitelist_externals = tar bash - time commands = tar -C {envtmpdir} -vxf {toxinidir}/tests/integration/net.tar bash {envtmpdir}/net/start.sh - time bash -c "python3 {envtmpdir}/net/wait.py {envtmpdir}/net/{auth,relay,exit}*" + bash -c "time python3 {envtmpdir}/net/wait.py {envtmpdir}/net/{auth,relay,exit}*" coverage run -a --rcfile={toxinidir}/.coveragerc --source=sbws -m pytest -s {toxinidir}/tests/integration -vv bash {envtmpdir}/net/stop.sh

1 0