commit 4999ed64dfdeb693f2e72d4b5675c07d1e5a9746 Author: juga0 juga@riseup.net Date: Thu Jul 5 15:03:10 2018 +0000
Replace variables for results' fixtures --- tests/unit/lib/test_resultdump.py | 61 +++++++++++++-------------------------- 1 file changed, 20 insertions(+), 41 deletions(-)
diff --git a/tests/unit/lib/test_resultdump.py b/tests/unit/lib/test_resultdump.py index 13b0db8..c956dea 100644 --- a/tests/unit/lib/test_resultdump.py +++ b/tests/unit/lib/test_resultdump.py @@ -1,53 +1,32 @@ # -*- coding: utf-8 -*- """Unit tests for resultdump.""" -from sbws.lib.resultdump import trim_results_ip_changed, Result, ResultSuccess - - -TIME1 = 1529232277.9028733 -TIME2 = 1529232278.9028733 -FP1 = 'A' * 40 -FP2 = 'Z' * 40 -ED25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' -CIRC = [FP1, FP2] -DEST_URL = 'http://example.com/sbws.bin' -NICK = 'A' -RELAY_IP1 = '169.254.100.1' -RELAY_IP2 = '169.254.100.2' -RELAY1 = Result.Relay(FP1, NICK, RELAY_IP1, ED25519) -RELAY2 = Result.Relay(FP1, NICK, RELAY_IP2, ED25519) -RTTS = [5, 25] -DOWNLOADS = [{'duration': 4, 'amount': 40}] - -RESULTSUCCESS1 = ResultSuccess(RTTS, DOWNLOADS, RELAY1, CIRC, DEST_URL, - 'sbws', t=TIME1) -RESULTSUCCESS2 = ResultSuccess(RTTS, DOWNLOADS, RELAY2, CIRC, DEST_URL, - 'sbws', t=TIME2) -RESULTDICT_IP_CHANGED = {FP1: [RESULTSUCCESS1, RESULTSUCCESS2]} -RESULTDICT_IP_NOT_CHANGED = {FP1: [RESULTSUCCESS1, RESULTSUCCESS1]} - - -def test_trim_results_ip_changed_defaults(): - results_dict = trim_results_ip_changed(RESULTDICT_IP_NOT_CHANGED) - assert RESULTDICT_IP_NOT_CHANGED == results_dict - - -def test_trim_results_ip_changed_on_changed_ipv4_changed(): - expected_results_dict = {FP1: [RESULTSUCCESS2]} - results_dict = trim_results_ip_changed(RESULTDICT_IP_CHANGED, +from sbws.lib.resultdump import trim_results_ip_changed + + +def test_trim_results_ip_changed_defaults(resultdict_ip_not_changed): + results_dict = trim_results_ip_changed(resultdict_ip_not_changed) + assert resultdict_ip_not_changed == results_dict + + +def test_trim_results_ip_changed_on_changed_ipv4_changed( + resultdict_ip_changed, resultdict_ip_changed_trimmed): + results_dict = trim_results_ip_changed(resultdict_ip_changed, on_changed_ipv4=True) - assert expected_results_dict == results_dict + assert resultdict_ip_changed_trimmed == results_dict
-def test_trim_results_ip_changed_on_changed_ipv4_no_changed(): - results_dict = trim_results_ip_changed(RESULTDICT_IP_NOT_CHANGED, +def test_trim_results_ip_changed_on_changed_ipv4_no_changed( + resultdict_ip_not_changed): + results_dict = trim_results_ip_changed(resultdict_ip_not_changed, on_changed_ipv4=True) - assert RESULTDICT_IP_NOT_CHANGED == results_dict + assert resultdict_ip_not_changed == results_dict
-def test_trim_results_ip_changed_on_changed_ipv6(caplog): - results_dict = trim_results_ip_changed(RESULTDICT_IP_NOT_CHANGED, +def test_trim_results_ip_changed_on_changed_ipv6(caplog, + resultdict_ip_not_changed): + results_dict = trim_results_ip_changed(resultdict_ip_not_changed, on_changed_ipv6=True) - assert RESULTDICT_IP_NOT_CHANGED == results_dict + assert resultdict_ip_not_changed == results_dict for record in caplog.records: assert record.levelname == 'WARNING' assert 'Reseting bandwidth results when IPv6 changes, ' \