commit 44489f37377b570b2f19a9d2ac9fb9474b9a885f Merge: e7bc95c 3033421 Author: juga0 juga@riseup.net Date: Tue Apr 14 13:51:13 2020 +0000

Merge branch 'maint-1.1'

docs/source/implementation.rst | 92 +- sbws/core/bwfile_health.py | 19 + sbws/core/scanner.py | 10 +- sbws/globals.py | 20 + sbws/lib/bwfile_health.py | 273 + sbws/lib/heartbeat.py | 2 +- sbws/lib/relaylist.py | 207 +- sbws/lib/relayprioritizer.py | 40 +- sbws/lib/resultdump.py | 140 +- sbws/lib/v3bwfile.py | 68 +- sbws/util/json.py | 44 + sbws/util/state.py | 58 +- sbws/util/timestamps.py | 89 + tests/conftest.py | 54 + tests/data/.sbws/state.dat | 42 +- tests/data/2020-02-29-10-05-00-server-descriptors | 33855 ++++++++++++++++++++ tests/data/2020-03-22-08-35-00-bandwidth | 8241 +++++ tests/integration/conftest.py | 11 +- tests/integration/test_files.py | 49 + tests/unit/conftest.py | 33 +- tests/unit/lib/data/results.txt | 5 +- tests/unit/lib/test_heartbeat.py | 12 +- tests/unit/lib/test_relaylist.py | 158 +- tests/unit/lib/test_relayprioritizer.py | 76 + tests/unit/lib/test_resultdump.py | 66 +- tests/unit/lib/test_results.py | 59 + tests/unit/lib/test_v3bwfile.py | 83 +- tests/unit/test_bwfile_health.py | 28 + tests/unit/util/test_json.py | 54 + tests/unit/util/test_state.py | 60 +- tests/unit/util/test_timestamps.py | 44 + 31 files changed, 43630 insertions(+), 362 deletions(-)