From e831fdeb9d1b289d4af018e28bc8e4ee5f7537ce Mon Sep 17 00:00:00 2001 From: juga0 Date: Sat, 24 Mar 2018 17:31:50 +0000 Subject: [PATCH] Fix slash in previous commit --- bwscanner/measurement.py | 5 ++++- test/test_measurement.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bwscanner/measurement.py b/bwscanner/measurement.py index 30dd146..94ecbbf 100644 --- a/bwscanner/measurement.py +++ b/bwscanner/measurement.py @@ -44,6 +44,9 @@ def __init__(self, state, clock, measurement_dir, **kwargs): self.tasks = [] self.circuits = None self.baseurl = kwargs.get('baseurl') + # test does not use baseurl + if self.baseurl is not None: + assert self.baseurl.endswith('/') self.bw_files = kwargs.get('bw_files') self.result_sink = ResultSink(self.measurement_dir, chunk_size=10) @@ -64,7 +67,7 @@ def choose_file_size(self, path): return max(self.bw_files.keys()) def choose_url(self, path): - return self.baseurl + '/' + self.bw_files[self.choose_file_size(path)][0] + return self.baseurl + self.bw_files[self.choose_file_size(path)][0] def run_scan(self): all_done = defer.Deferred() diff --git a/test/test_measurement.py b/test/test_measurement.py index 39bad9e..92bebd8 100644 --- a/test/test_measurement.py +++ b/test/test_measurement.py @@ -40,7 +40,7 @@ def test_scan_chutney(self): # check that each run is producing the same input set! self.tmp = mkdtemp() scan = BwScan(self.tor_state, reactor, self.tmp) - scan.baseurl = 'http://127.0.0.1:{}'.format(self.port) + scan.baseurl = 'http://127.0.0.1:{}/'.format(self.port) # FIXME: to simplify test, use same data and hash, no matter what the file size is scan.bw_files = { 64*1024: ("64M", '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8'),