March 2020 - tor-commits - lists.torproject.org

[sbws/maint-1.1] fix: relaylist: Stop passing argument to self.is_old
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit 380a80624ebd1dda9066cd5a4d8dd7c26c14e196 Author: juga0 <juga(a)riseup.net> Date: Tue Mar 3 18:28:48 2020 +0000 fix: relaylist: Stop passing argument to self.is_old --- sbws/lib/relaylist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 65ec526..64a53d9 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -471,7 +471,7 @@ class RelayList: # If the relay is not in the current consensus but is not "old" # yet, add it to the new list of relays too, though its timestamp, # router status and descriptor can't be updated. - elif not r.is_old(self._measurements_period): + elif not r.is_old(): new_relays.append(r) # Otherwise, don't add it to the new list of relays. # For debugging, count the old relays that will be discarded.

1 0

[sbws/maint-1.1] fix: timestamp: measurements period is in seconds
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit 3ec1a8e6658c3766a3dad15000416569428fa17b Author: juga0 <juga(a)riseup.net> Date: Tue Mar 3 18:31:41 2020 +0000 fix: timestamp: measurements period is in seconds by default days is passed to timedelta, what was making the oldest date be thousands of days in the past. --- sbws/util/timestamp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/timestamp.py b/sbws/util/timestamp.py index ee0755a..075e82b 100644 --- a/sbws/util/timestamp.py +++ b/sbws/util/timestamp.py @@ -90,5 +90,5 @@ def is_old(timestamp, measurements_period=MEASUREMENTS_PERIOD): # This will raise an exception if the type is not int or float or # is not actually a timestamp timestamp = unixts_to_dt_obj(timestamp) - oldest_date = datetime.utcnow() - timedelta(measurements_period) + oldest_date = datetime.utcnow() - timedelta(seconds=measurements_period) return timestamp < oldest_date

1 0

[sbws/maint-1.1] fix: tests: Add test for remove old consensus ts
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit 6aaa438e4c6e623afda7d0251b43cb48a8bc7a58 Author: juga0 <juga(a)riseup.net> Date: Sun Mar 8 16:36:44 2020 +0000 fix: tests: Add test for remove old consensus ts Tests don't pass in this commit, it's fixed in the next commits. --- tests/unit/lib/test_relaylist.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/unit/lib/test_relaylist.py b/tests/unit/lib/test_relaylist.py new file mode 100644 index 0000000..3dec382 --- /dev/null +++ b/tests/unit/lib/test_relaylist.py @@ -0,0 +1,23 @@ +"""relaylist.py unit tests.""" +from datetime import datetime, timedelta + +# When datetime is imported as a class (`from datetime import datetime`) it can +# not be mocked because it is a built-in type. It can only be mocked when +# imported as module. +# freezegun is able to mock any datetime object, it also allows comparations. +from freezegun import freeze_time + +from sbws.lib.relaylist import remove_old_consensus_timestamps + + +def test_remove_old_consensus_timestamps(): + days_ago = datetime(2020, 3, 1) + timestamps = [days_ago] + [ + days_ago + timedelta(days=x) for x in range(1, 5) + ] + with freeze_time(days_ago + timedelta(days=5, seconds=1)): + new_timestamps = remove_old_consensus_timestamps( + timestamps, 5 * 24 * 60 * 60 + ) + assert len(new_timestamps) == len(timestamps) - 1 + assert days_ago not in new_timestamps

1 0

[sbws/maint-1.1] fix: timestamp: Old timestamps are minor than older
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit d7b5d3deef1c303461f623d32eaf76782f2910eb Author: juga0 <juga(a)riseup.net> Date: Tue Mar 3 18:33:47 2020 +0000 fix: timestamp: Old timestamps are minor than older Old timestamps are minor than the older date, not major. --- sbws/util/timestamp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/timestamp.py b/sbws/util/timestamp.py index 4c3fb34..ee0755a 100644 --- a/sbws/util/timestamp.py +++ b/sbws/util/timestamp.py @@ -91,4 +91,4 @@ def is_old(timestamp, measurements_period=MEASUREMENTS_PERIOD): # is not actually a timestamp timestamp = unixts_to_dt_obj(timestamp) oldest_date = datetime.utcnow() - timedelta(measurements_period) - return timestamp > oldest_date + return timestamp < oldest_date

1 0

[sbws/maint-1.1] Merge branch 'maint-1.1'
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit 0b0dfe8e489a2e67ab9c3ddb44eca818d9125804 Merge: fe8ecfe 996e825 Author: juga0 <juga(a)riseup.net> Date: Sun Feb 9 19:20:10 2020 +0000 Merge branch 'maint-1.1' .travis.yml | 148 +++++++-- tests/deb.torproject.org.asc | 708 ------------------------------------------- tox.ini | 9 +- 3 files changed, 135 insertions(+), 730 deletions(-)

1 0

[sbws/maint-1.1] fix: tests: Add test timestamp.is_old
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit feae0a57e7ec14b1904d56d2f6081605a996f086 Author: juga0 <juga(a)riseup.net> Date: Tue Mar 3 18:36:42 2020 +0000 fix: tests: Add test timestamp.is_old The tests don't pass in this commit, it's fixed in the next ones. --- tests/unit/util/test_timestamp.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/unit/util/test_timestamp.py b/tests/unit/util/test_timestamp.py index 8ebc2f6..37cc9ea 100644 --- a/tests/unit/util/test_timestamp.py +++ b/tests/unit/util/test_timestamp.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- """Test timestamp conversion util functions""" -from datetime import datetime, timezone - +from datetime import datetime, timezone, timedelta from sbws.util.timestamp import (dt_obj_to_isodt_str, unixts_to_dt_obj, - unixts_to_isodt_str, unixts_to_str) + unixts_to_isodt_str, unixts_to_str, is_old) isodt_str = '2018-05-23T12:55:04' @@ -25,3 +24,14 @@ def test_unixts_to_isodt_str(): def test_unixts_to_str(): assert str(unixts) == unixts_to_str(unixts) + + +def test_is_old(): + # Since this timestamp is generated a few microseconds before checking + # the oldest timestamp, it will be old. + old_timestamp = datetime.utcnow() - timedelta(days=5) + assert is_old(old_timestamp) + # A recent timestamp should be at least 1 second newer that the oldest + recent_timestamp = datetime.utcnow() - timedelta(days=5) \ + + timedelta(seconds=1) + assert not is_old(recent_timestamp)

1 0

[sbws/maint-1.1] Merge branch 'maint-1.1'
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit fe8ecfef1b8b6e6c76c91c54a80c27ad2960784b Merge: f846c5d 05bb23c Author: juga0 <juga(a)riseup.net> Date: Sun Feb 9 19:13:25 2020 +0000 Merge branch 'maint-1.1' sbws/globals.py | 8 ++++++++ sbws/lib/relaylist.py | 26 +++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-)

1 0

[sbws/maint-1.1] Merge branch 'maint-1.1'
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit 44ece919978ba581415ebeb2f03a3f56ef3565ca Merge: 0b0dfe8 b6480a2 Author: juga0 <juga(a)riseup.net> Date: Thu Feb 13 13:18:40 2020 +0000 Merge branch 'maint-1.1' sbws/lib/relaylist.py | 1 + 1 file changed, 1 insertion(+)

1 0

[sbws/maint-1.1] Merge branch 'maint-1.1'
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit 205eefd1af9ea38098b8cab7cf7251671cf47f73 Merge: 44ece91 c36518c Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 18:50:40 2020 +0000 Merge branch 'maint-1.1' sbws/globals.py | 3 +++ sbws/lib/destination.py | 45 ++++++++++++++++++++++++++------------ tests/unit/lib/test_destination.py | 20 +++++++++++++++++ 3 files changed, 54 insertions(+), 14 deletions(-)

1 0

[sbws/maint-1.1] Merge branch 'maint-1.1'
by juga＠torproject.org 09 Mar '20

09 Mar '20

commit f846c5d697300067377de1195fe7f97ec090f672 Merge: 003c3c8 f01a6fe Author: juga0 <juga(a)riseup.net> Date: Wed Feb 5 14:55:45 2020 +0000 Merge branch 'maint-1.1' sbws/lib/relaylist.py | 40 ++++++++++++++++++++++++++++++++++------ sbws/util/timestamp.py | 23 ++++++++++++++++++++++- 2 files changed, 56 insertions(+), 7 deletions(-)

1 0