commit 3c2c03512375c11dfbaf1d42b82ef2e889e23c7e
Author: juga0 <[email protected]>
Date: Fri Feb 8 11:08:00 2019 +0000
new: tests: include measurements count KeyValues
Closes: #28567
---
tests/unit/lib/data/results.txt | 4 ++--
tests/unit/lib/test_v3bwfile.py | 12 +++++++++++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/tests/unit/lib/data/results.txt b/tests/unit/lib/data/results.txt
index 59a35b4..4a95b58 100644
--- a/tests/unit/lib/data/results.txt
+++ b/tests/unit/lib/data/results.txt
@@ -1,2 +1,2 @@
-{"version": 4, "time": 1523887747, "circ":
["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts":
[0.4596822261810303, 0.44872617721557617, 0.4563450813293457,
0.44872212409973145, 0.4561030864715576, 0.4765200614929199,
0.4495084285736084, 0.45711588859558105, 0.45520496368408203,
0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009,
"duration": 6.1014368534088135}, {"amount": 590009, "duration":
8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192},
{"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663,
"duration": 5.779450178146362}], "dest_url": "http://y.z";, "nickname": "A",
"address": "111.111.111.111", "master_key_ed25519":
"g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth":
1000000000, "relay_burst_bandwidth": 123456, "relay_observed_bandwidth":
524288, "consensus_ba
ndwidth": 600000, "consensus_bandwidth_is_unmeasured": false}
-{"version": 4, "time": 1523974147, "circ":
["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "error-stream", "msg":
"Something bad happened while measuring bandwidth", "fingerprint":
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner":
"IDidntEditTheSBWSConfig", "dest_url": "http://y.z";, "nickname": "A",
"address": "111.111.111.111", "master_key_ed25519":
"g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"}
+{"version": 4, "time": 1523887747, "circ":
["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts":
[0.4596822261810303, 0.44872617721557617, 0.4563450813293457,
0.44872212409973145, 0.4561030864715576, 0.4765200614929199,
0.4495084285736084, 0.45711588859558105, 0.45520496368408203,
0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009,
"duration": 6.1014368534088135}, {"amount": 590009, "duration":
8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192},
{"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663,
"duration": 5.779450178146362}], "dest_url": "http://y.z";, "nickname": "A",
"address": "111.111.111.111", "master_key_ed25519":
"g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth":
1000000000, "relay_burst_bandwidth": 123456, "relay_observed_bandwidth":
524288, "consensus_ba
ndwidth": 600000, "consensus_bandwidth_is_unmeasured": false,
"relay_recent_measurement_attempt_count": 1,
"relay_recent_priority_list_count": 3}
+{"version": 4, "time": 1523974147, "circ":
["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "error-stream", "msg":
"Something bad happened while measuring bandwidth", "fingerprint":
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner":
"IDidntEditTheSBWSConfig", "dest_url": "http://y.z";, "nickname": "A",
"address": "111.111.111.111", "master_key_ed25519":
"g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s",
"relay_recent_measurement_attempt_count": 2,
"relay_recent_priority_list_count": 3}
diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py
index a6de526..c4c6a20 100644
--- a/tests/unit/lib/test_v3bwfile.py
+++ b/tests/unit/lib/test_v3bwfile.py
@@ -28,8 +28,15 @@ file_created_l = KEYVALUE_SEP_V1.join(['file_created',
file_created])
latest_bandwidth = '2018-04-17T14:09:07'
latest_bandwidth_l = KEYVALUE_SEP_V1.join(['latest_bandwidth',
latest_bandwidth])
+attempts = '1'
+attempts_l = KEYVALUE_SEP_V1.join(['recent_measurement_attempt_count',
+ attempts])
+failure = '0'
+failure_l = KEYVALUE_SEP_V1.join(['recent_measurement_failure_count',
+ failure])
header_ls = [timestamp_l, version_l, destinations_countries_l, file_created_l,
latest_bandwidth_l,
+ # attempts_l, failure_l,
scanner_country_l, software_l, software_version_l, TERMINATOR]
header_str = LINE_SEP.join(header_ls) + LINE_SEP
earliest_bandwidth = '2018-04-16T14:09:07'
@@ -52,7 +59,10 @@ raw_bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\
"error_second_relay=0 error_stream=1 " \
"master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s " \
"nick=A " \
- "node_id=$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 " \
+ "node_id=$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "\
+ "relay_recent_measurement_attempt_count=2 "\
+ "relay_recent_priority_list_count=3 "\
+ "rtt=456 success=1 " \
"time=2018-04-17T14:09:07\n"
v3bw_str = header_extra_str + raw_bwl_str
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
