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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 31 Mar '15

31 Mar '15

commit 7d26e77d9b350b489059c2ef6eacdb40afb43739 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 31 13:45:14 2015 +0000 Update translations for https_everywhere --- sk/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/https-everywhere.dtd b/sk/https-everywhere.dtd index be1648b..29ad6e9 100644 --- a/sk/https-everywhere.dtd +++ b/sk/https-everywhere.dtd @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.menu.observatory "Nastavenia SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Povoliť HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Zakázať HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests"> +<!ENTITY https-everywhere.menu.blockHttpRequests "Zablokovať všetky HTTP žiadosti"> <!ENTITY https-everywhere.menu.showCounter "Zobraziť počítadlo"> <!ENTITY https-everywhere.prefs.title "Nastavenia HTTPS Everywhere">

1 0

[webwml/master] move donors to the top of the sponsors list
by arma＠torproject.org 31 Mar '15

31 Mar '15

commit ddce144ebbe6765aaa65921ab0949ae30a257417 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Mar 31 09:32:16 2015 -0400 move donors to the top of the sponsors list --- about/en/sponsors.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index cfa7f59..0c2cfdd 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -25,6 +25,7 @@ <h3>Active Sponsors in 2015:</h3> <ul> + <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li> <li><a href="https://www.reddit.com/">Reddit</a> (2015)</li> <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> @@ -33,7 +34,6 @@ <li><a href="http://www.sri.com/">SRI International</a> (2011-2015)</li> <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2016)</li> <li>An anonymous North American ISP (2009-present)</li> - <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li> </ul> <h3>Past sponsors</h3>

1 0

[webwml/master] add reddit, move gsoc
by arma＠torproject.org 31 Mar '15

31 Mar '15

commit 74560f8ae84b85286d378d3f0f0b1c602e170c17 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Mar 31 09:21:39 2015 -0400 add reddit, move gsoc --- about/en/sponsors.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index 45d4bbb..cfa7f59 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -25,6 +25,7 @@ <h3>Active Sponsors in 2015:</h3> <ul> + <li><a href="https://www.reddit.com/">Reddit</a> (2015)</li> <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2017)</li> @@ -32,7 +33,6 @@ <li><a href="http://www.sri.com/">SRI International</a> (2011-2015)</li> <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2016)</li> <li>An anonymous North American ISP (2009-present)</li> - <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-present)</li> <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li> </ul> @@ -40,6 +40,7 @@ <p>We greatly appreciate the support provided by our past sponsors in keeping the Tor Project progressing through our ambitious goals:</p> <ul> + <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2014)</li> <li><a href="http://www.fordfoundation.org/">The Ford Foundation</a> (2013-2014)</li> <li><a href="https://disconnect.me/">Disconnect</a> (2014)</li> <li><a href="https://freedom.press/">Freedom of the Press Foundation</a> (2014)</li>

1 0

[bridgedb/develop] Add test for b.s.ScheduledInterval.intervalStart() that exposes a bug.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit 9edb69565eb7968c101452662a18dd778b13193d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 10:29:57 2015 +0000 Add test for b.s.ScheduledInterval.intervalStart() that exposes a bug. ScheduledInterval.intervalStart(), when called with a float, i.e. as is returned from time.time() which is used by the email distributor to pass timestamps into ScheduledInterval.intervalStart(), returns a float. This could cause bugs in other parts of the code which expect ints for timestamps. --- lib/bridgedb/test/test_schedule.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/test/test_schedule.py b/lib/bridgedb/test/test_schedule.py index f5ab886..6a38871 100644 --- a/lib/bridgedb/test/test_schedule.py +++ b/lib/bridgedb/test/test_schedule.py @@ -143,6 +143,18 @@ class ScheduledIntervalTests(unittest.TestCase): def test_ScheduledInterval_intervalStart_seconds(self): self._check_intervalStart(30, 'seconds', 30) + def test_ScheduledInterval_intervalStart_time_time(self): + """Calling ScheduledInterval.intervalStart(time.time()) should only + return ints, not floats. + """ + import time + + timestamp = time.time() + sched = self.sched(5, 'minutes') + + self.assertIsInstance(timestamp, float) + self.assertIsInstance(sched.intervalStart(timestamp), int) + def _check_getInterval(self, count=30, period='second', variance=30): """Test the ScheduledInterval.getInterval() method.

1 0

[bridgedb/develop] Fix bug in b.s.ScheduledInterval.intervalStart().
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit 83e84d10079a6d4ca8513d470f045519ea6e145e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 10:38:05 2015 +0000 Fix bug in b.s.ScheduledInterval.intervalStart(). * FIXES a bug exposed by the test committed in 9edb6956. * CHANGES b.s.ScheduledInterval.intervalStart() to convert any timestamps which are passd into it to integers. --- lib/bridgedb/schedule.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 659380f..0adbff8 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -12,6 +12,8 @@ import calendar +import math + from datetime import datetime from zope import interface @@ -237,6 +239,9 @@ class ScheduledInterval(Unscheduled): :returns: The Unix epoch timestamp for the start time of the interval that contains **when**. """ + # Convert `when`s which are floats, i.e. from time.time(), to ints: + when = int(math.ceil(when)) + if self.intervalPeriod == 'month': # For months, we always start at the beginning of the month. date = fromUnixSeconds(when)

1 0

[bridgedb/develop] Log when we treat a client differently because they are using Tor.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit eaedec23b264fe515ed116d690da1c5396f30198 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 30 01:13:11 2015 +0000 Log when we treat a client differently because they are using Tor. * FIXES #4771: https://bugs.torproject.org/4771 --- lib/bridgedb/Dist.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index db71db3..961d2ca 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -289,13 +289,19 @@ class IPBasedDistributor(Distributor): # try to match the request to an ip category for category in self.categories: # IP Categories - if category.contains(ip): + if ip in category: + # The tag is a tag applied to a proxy IP address when it is + # added to the bridgedb.proxy.ProxySet. For Tor Exit relays, + # the default is 'exit_relay'. For other proxies loaded from + # the PROXY_LIST_FILES config option, the default tag is the + # full filename that the IP address originally came from. + tag = category.getTag(ip) + logging.info("Client was from known proxy (tag: %s): %s" % (tag, ip)) g = filterAssignBridgesToRing(self.splitter.hmac, self.nClusters + len(self.categories), n) bridgeFilterRules.append(g) - logging.info("category<%s>%s", epoch, logSafely(area)) pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) key1 = getHMAC(self.splitter.key, "Order-Bridges-In-Ring-%d" % n)

1 0

[bridgedb/develop] Serve Tor clients a more restricted set of bridges per period.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit 7fa64bca8f132e599fc0355dfb1673cabaaf6ba2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 30 01:15:35 2015 +0000 Serve Tor clients a more restricted set of bridges per period. See https://trac.torproject.org/projects/tor/ticket/4771#comment:14 for more information. Essentially, by using the `area` (which is the client's IP address, truncated to the /24, i.e. if the client's IP is 1.2.3.4, then the `area` would be 1.2.3) in the HMAC for placing the client into the hashring, the resulting HMAC would be different for each Tor Exit (but not for Exits in the same /24). This would enable clients who changed their Exit relay to get new bridges. Instead, we now group Tor/proxy users into four groups, based on their Exit relay's or proxy's IP address. Regardless of how many times a client changes their Exit or proxy, they will only get up to four sets of bridge lines (per period). --- lib/bridgedb/Dist.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 961d2ca..9a2b051 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -12,6 +12,7 @@ """This module has functions to decide which bridges to hand out to whom.""" +import ipaddr import logging import re import time @@ -302,7 +303,14 @@ class IPBasedDistributor(Distributor): len(self.categories), n) bridgeFilterRules.append(g) - pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) + # Cluster Tor/proxy users into four groups. This means that + # no matter how many different Tor Exits or proxies a client + # uses, the most they can ever get is four different sets of + # bridge lines (per period). + group = (int(ipaddr.IPAddress(ip)) % 4) + 1 + logging.debug(("Assigning client hashring position based on: " + "known-proxy<%s>%s") % (epoch, group)) + pos = self.areaOrderHmac("known-proxy<%s>%s" % (epoch, group)) key1 = getHMAC(self.splitter.key, "Order-Bridges-In-Ring-%d" % n) break

1 0

[bridgedb/develop] Change Dist.uniformMap() to return proper CIDR subnet notations.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit 1d884603013c02f145eda05e2c6bef42dc611660 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 01:42:41 2015 +0000 Change Dist.uniformMap() to return proper CIDR subnet notations. --- lib/bridgedb/Dist.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 9a2b051..cd91d62 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -17,9 +17,6 @@ import logging import re import time -from ipaddr import IPv6Address -from ipaddr import IPAddress - import bridgedb.Bridges import bridgedb.Storage @@ -56,20 +53,31 @@ def uniformMap(ip): >>> from bridgedb import Dist >>> Dist.uniformMap('1.2.3.4') - '1.2.3' + '1.2.3.0/24' >>> Dist.uniformMap('1.2.3.154') - '1.2.3' + '1.2.3.0/24' >>> Dist.uniformMap('2001:f::bc1:b13:2808') - '2001:000f:0000:0000' + '2001:f::/64' + >>> Dist.uniformMap('2a00:c98:2030:a020:2::42') + '2a00:c98:2030:a020::/64' :param str ip: A string representing an IPv4 or IPv6 address. :rtype: str - :returns: The truncated **ip**. + :returns: The appropriately sized CIDR subnet representation of the **ip**. """ - if type(IPAddress(ip)) is IPv6Address: - return ":".join(IPv6Address(ip).exploded.split(':')[:4]) + # We aren't using bridgedb.parse.addr.isIPAddress(ip, compressed=False) + # here because adding the string "False" into the map would land any and + # all clients whose IP address appeared to be invalid at the same position + # in a hashring. + address = ipaddr.IPAddress(ip) + if address.version == 6: + truncated = ':'.join(address.exploded.split(':')[:4]) + subnet = str(ipaddr.IPv6Network(truncated + "::/64")) + return subnet else: - return ".".join(ip.split(".")[:3]) + truncated = '.'.join(address.exploded.split('.')[:3]) + subnet = str(ipaddr.IPv4Network(truncated + '.0/24')) + return subnet def getNumBridgesPerAnswer(ring, max_bridges_per_answer=3): if len(ring) < 20: @@ -280,7 +288,7 @@ class IPBasedDistributor(Distributor): % ' '.join([x.func_name for x in bridgeFilterRules])) area = self.areaMapper(ip) - logging.debug("IP mapped to area:\t%s.0 /24" % area) + logging.debug("IP mapped to area:\t%s" % area) key1 = '' pos = 0

1 0

[bridgedb/develop] Change Dist.uniformMap() to return IPv4 /16s, not /24s.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit a1d5c24322402d13de02b4e6f9943352b79bfba2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 01:51:10 2015 +0000 Change Dist.uniformMap() to return IPv4 /16s, not /24s. See https://trac.torproject.org/projects/tor/ticket/4771#comment:23 * FIXES part of #4771. --- lib/bridgedb/Dist.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index cd91d62..466db84 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -48,14 +48,14 @@ class EmailRequestedKey(Exception): def uniformMap(ip): """Map an IP to an arbitrary 'area' string, such that any two IPv4 - addresses in the same ``/24`` subnet, or any two IPv6 addresses in the + addresses in the same ``/16`` subnet, or any two IPv6 addresses in the same ``/64`` subnet, get the same string. >>> from bridgedb import Dist >>> Dist.uniformMap('1.2.3.4') - '1.2.3.0/24' - >>> Dist.uniformMap('1.2.3.154') - '1.2.3.0/24' + '1.2.0.0/16' + >>> Dist.uniformMap('1.2.211.154') + '1.2.0.0/16' >>> Dist.uniformMap('2001:f::bc1:b13:2808') '2001:f::/64' >>> Dist.uniformMap('2a00:c98:2030:a020:2::42') @@ -75,8 +75,8 @@ def uniformMap(ip): subnet = str(ipaddr.IPv6Network(truncated + "::/64")) return subnet else: - truncated = '.'.join(address.exploded.split('.')[:3]) - subnet = str(ipaddr.IPv4Network(truncated + '.0/24')) + truncated = '.'.join(address.exploded.split('.')[:2]) + subnet = str(ipaddr.IPv4Network(truncated + '.0.0/16')) return subnet def getNumBridgesPerAnswer(ring, max_bridges_per_answer=3):

1 0

[bridgedb/develop] Switch `count` and `period` parameter order in bridgedb.schedule.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit c78b23832e1f1838f5ff99ba96b675a7a1891258 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 02:15:34 2015 +0000 Switch `count` and `period` parameter order in bridgedb.schedule. --- lib/bridgedb/captcha.py | 2 +- lib/bridgedb/schedule.py | 14 +++---- lib/bridgedb/test/test_HTTPServer.py | 2 +- lib/bridgedb/test/test_schedule.py | 74 +++++++++++++++++----------------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 234bbb4..d2fbcc1 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -206,7 +206,7 @@ class GimpCaptcha(Captcha): .. _gimp-captcha: https://github.com/isislovecruft/gimp-captcha """ - sched = schedule.ScheduledInterval('minutes', 30) + sched = schedule.ScheduledInterval(30, 'minutes') def __init__(self, publicKey=None, secretKey=None, hmacKey=None, cacheDir=None): diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 6757343..06914d9 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -68,11 +68,11 @@ class Unscheduled(object): implements(ISchedule) - def __init__(self, period=None, count=None): + def __init__(self, count=None, period=None): """Create a schedule for dividing time into intervals. - :param str period: One of the periods in :data:`KNOWN_INTERVALS`. :param int count: The number of **period**s in an interval. + :param str period: One of the periods in :data:`KNOWN_INTERVALS`. """ self.intervalCount = count self.intervalPeriod = period @@ -102,7 +102,6 @@ class Unscheduled(object): specificity depends on what type of interval we're using. For example, if using ``"month"``, the return value would be something like ``"2013-12"``. - """ return fromUnixSeconds(0).strftime('%04Y-%02m-%02d %02H:%02M:%02S') @@ -125,13 +124,14 @@ class ScheduledInterval(Unscheduled): """ implements(ISchedule) - def __init__(self, period=None, count=None): + def __init__(self, count=None, period=None): """Create a schedule for dividing time into intervals. + :type count: int or str + :param count: The number of **period**s in an interval. :param str period: One of the periods in :data:`KNOWN_INTERVALS`. - :param int count: The number of **period**s in an interval. """ - super(ScheduledInterval, self).__init__(period, count) + super(ScheduledInterval, self).__init__(count, period) self._setIntervalCount(count) self._setIntervalPeriod(period) @@ -219,7 +219,7 @@ class ScheduledInterval(Unscheduled): >>> import calendar >>> from bridgedb.schedule import ScheduledInterval - >>> sched = ScheduledInterval('month', 1) + >>> sched = ScheduledInterval(1, 'month') >>> when = calendar.timegm((2007, 12, 12, 0, 0, 0)) >>> sched.getInterval(when) '2007-12' diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index ee6e588..68616bf 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -518,7 +518,7 @@ class WebResourceBridgesTests(unittest.TestCase): self.root = Resource() self.dist = DummyIPBasedDistributor() - self.sched = ScheduledInterval('hour', 1) + self.sched = ScheduledInterval(1, 'hour') self.nBridgesPerRequest = 2 self.bridgesResource = HTTPServer.WebResourceBridges( self.dist, self.sched, N=2, diff --git a/lib/bridgedb/test/test_schedule.py b/lib/bridgedb/test/test_schedule.py index d7fc9c1..f5ab886 100644 --- a/lib/bridgedb/test/test_schedule.py +++ b/lib/bridgedb/test/test_schedule.py @@ -68,40 +68,40 @@ class ScheduledIntervalTests(unittest.TestCase): def test_ScheduledInterval_providesISchedule(self): """ScheduledInterval should implement the ISchedule interface.""" - self.assertTrue(schedule.ISchedule.providedBy(self.sched('month', 1))) + self.assertTrue(schedule.ISchedule.providedBy(self.sched(1, 'month'))) def _check_init(self, sched): """The instance should be an instance of its class.""" self.assertIsInstance(sched, schedule.ScheduledInterval) def test_ScheduledInterval_init_month(self): - self._check_init(self.sched('month', 1)) + self._check_init(self.sched(1, 'month')) def test_ScheduledInterval_init_week(self): - self._check_init(self.sched('week', 2)) + self._check_init(self.sched(2, 'week')) def test_ScheduledInterval_init_day(self): - self._check_init(self.sched('days', 5)) + self._check_init(self.sched(5, 'days')) def test_ScheduledInterval_init_hour(self): - self._check_init(self.sched('hours', 12)) + self._check_init(self.sched(12, 'hours')) def test_ScheduledInterval_init_minute(self): - self._check_init(self.sched('minute', 10)) + self._check_init(self.sched(10, 'minute')) def test_ScheduledInterval_init_seconds(self): - self._check_init(self.sched('seconds', 30)) + self._check_init(self.sched(30, 'seconds')) def test_ScheduledInterval_init_badIntervalPeriod(self): self.assertRaises(schedule.UnknownInterval, - self.sched, 'decades', 2) + self.sched, 2, 'decades') def test_ScheduledInterval_init_badIntervalCount(self): self.assertRaises(schedule.UnknownInterval, - self.sched, 'minutes', 'd20') + self.sched, 'd20', 'minutes') def test_ScheduledInterval_init_negativeIntervalCount(self): - sched = self.sched('days', -100000) + sched = self.sched(-100000, 'days') self.assertEquals(sched.intervalCount, 1) self.assertEquals(sched.intervalPeriod, 'day') @@ -111,48 +111,48 @@ class ScheduledIntervalTests(unittest.TestCase): self.assertEquals(sched.intervalCount, 1) self.assertEquals(sched.intervalPeriod, 'hour') - def _check_intervalStart(self, period='second', count=30, variance=30): + def _check_intervalStart(self, count=30, period='second', variance=30): """Test the ScheduledInterval.intervalStart() method. - :param str period: The interval type for the period. :param int count: The number of **period**s within an interval. + :param str period: The interval type for the period. :param int variance: The amount of variance (in seconds) to tolerate between the start of the interval containing now, and now. """ now = int(self.now()) - sched = self.sched(period, count) + sched = self.sched(count, period) time = sched.intervalStart(now) self.assertIsInstance(time, int) self.assertApproximates(now, time, variance) def test_ScheduledInterval_intervalStart_month(self): - self._check_intervalStart('month', 1, 31*24*60*60) + self._check_intervalStart(1, 'month', 31*24*60*60) def test_ScheduledInterval_intervalStart_week(self): - self._check_intervalStart('week', 2, 14*24*60*60) + self._check_intervalStart(2, 'week', 14*24*60*60) def test_ScheduledInterval_intervalStart_day(self): - self._check_intervalStart('days', 5, 5*24*60*60) + self._check_intervalStart(5, 'days', 5*24*60*60) def test_ScheduledInterval_intervalStart_hour(self): - self._check_intervalStart('hours', 12, 12*60*60) + self._check_intervalStart(12, 'hours', 12*60*60) def test_ScheduledInterval_intervalStart_minute(self): - self._check_intervalStart('minute', 10, 10*60) + self._check_intervalStart(10, 'minute', 10*60) def test_ScheduledInterval_intervalStart_seconds(self): - self._check_intervalStart('seconds', 30, 30) + self._check_intervalStart(30, 'seconds', 30) - def _check_getInterval(self, period='second', count=30, variance=30): + def _check_getInterval(self, count=30, period='second', variance=30): """Test the ScheduledInterval.getInterval() method. - :param str period: The interval type for the period. :param int count: The number of **period**s within an interval. + :param str period: The interval type for the period. :param int variance: The amount of variance (in seconds) to tolerate between the start of the interval containing now, and now. """ now = int(self.now()) - sched = self.sched(period, count) + sched = self.sched(count, period) ts = sched.getInterval(now) self.assertIsInstance(ts, str) secs = [int(x) for x in ts.replace('-', ' ').replace(':', ' ').split()] @@ -161,52 +161,52 @@ class ScheduledIntervalTests(unittest.TestCase): self.assertApproximates(now, secs, variance) def test_ScheduledInterval_getInterval_month(self): - self._check_getInterval('month', 2, 2*31*24*60*60) + self._check_getInterval(2, 'month', 2*31*24*60*60) def test_ScheduledInterval_getInterval_week(self): - self._check_getInterval('week', 1, 7*24*60*60) + self._check_getInterval(1, 'week', 7*24*60*60) def test_ScheduledInterval_getInterval_day(self): - self._check_getInterval('days', 4, 4*24*60*60) + self._check_getInterval(4, 'days', 4*24*60*60) def test_ScheduledInterval_getInterval_hour(self): - self._check_getInterval('hours', 23, 23*60*60) + self._check_getInterval(23, 'hours', 23*60*60) def test_ScheduledInterval_getInterval_minute(self): - self._check_getInterval('minutes', 15, 15*60) + self._check_getInterval(15, 'minutes', 15*60) def test_ScheduledInterval_getInterval_seconds(self): - self._check_getInterval('seconds', 10, 60) + self._check_getInterval(10, 'seconds', 60) - def _check_nextIntervalStarts(self, period='second', count=30, variance=30): + def _check_nextIntervalStarts(self, count=30, period='second', variance=30): """Test the ScheduledInterval.nextIntervalStarts() method. - :param str period: The interval type for the period. :param int count: The number of **period**s within an interval. + :param str period: The interval type for the period. :param int variance: The amount of variance (in seconds) to tolerate between the start of the interval containing now, and now. """ now = int(self.now()) - sched = self.sched(period, count) + sched = self.sched(count, period) time = sched.nextIntervalStarts(now) self.assertIsInstance(time, int) # (now + variance - time) should be > variance self.assertApproximates(now + variance, time, variance) def test_ScheduledInterval_nextIntervalStarts_month(self): - self._check_nextIntervalStarts('month', 2, 2*31*24*60*60) + self._check_nextIntervalStarts(2, 'month', 2*31*24*60*60) def test_ScheduledInterval_nextIntervalStarts_week(self): - self._check_nextIntervalStarts('week', 1, 7*24*60*60) + self._check_nextIntervalStarts(1, 'week', 7*24*60*60) def test_ScheduledInterval_nextIntervalStarts_day(self): - self._check_nextIntervalStarts('days', 4, 4*24*60*60) + self._check_nextIntervalStarts(4, 'days', 4*24*60*60) def test_ScheduledInterval_nextIntervalStarts_hour(self): - self._check_nextIntervalStarts('hours', 23, 23*60*60) + self._check_nextIntervalStarts(23, 'hours', 23*60*60) def test_ScheduledInterval_nextIntervalStarts_minute(self): - self._check_nextIntervalStarts('minutes', 15, 15*60) + self._check_nextIntervalStarts(15, 'minutes', 15*60) def test_ScheduledInterval_nextIntervalStarts_seconds(self): - self._check_nextIntervalStarts('seconds', 10, 10) + self._check_nextIntervalStarts(10, 'seconds', 10)

1 0