Skip to content

Commit 3d187a8

Browse files
committed
added unitests for utcnow_timestamp
1 parent 06be952 commit 3d187a8

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

frontera/contrib/backends/cassandra/components.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ def get_next_requests(self, max_n_requests, partition_id, **kwargs):
132132
"""
133133
results = []
134134
try:
135-
for item in self._order_by(self.queue_model.filter(partition_id=partition_id).
136-
allow_filtering()).limit(max_n_requests):
135+
for item in self._order_by(self.queue_model.filter(partition_id=partition_id).allow_filtering()).\
136+
limit(max_n_requests):
137137
method = item.method or b'GET'
138138
r = Request(item.url, method=method, meta=item.meta, headers=item.headers, cookies=item.cookies)
139139
r.meta[b'fingerprint'] = to_bytes(item.fingerprint)
@@ -208,8 +208,8 @@ def get_next_requests(self, max_n_requests, partition_id, **kwargs):
208208
tries, limit, count, len(queue.keys()))
209209
queue.clear()
210210
count = 0
211-
for item in self._order_by(self.queue_model.filter(partition_id=partition_id).
212-
allow_filtering()).limit(max_n_requests):
211+
for item in self._order_by(self.queue_model.filter(partition_id=partition_id).allow_filtering()).\
212+
limit(max_n_requests):
213213
if item.host_crc32 not in queue:
214214
queue[item.host_crc32] = []
215215
if max_requests_per_host is not None and len(queue[item.host_crc32]) > max_requests_per_host:

tests/contrib/backends/cassandra/test_backend_cassandra.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from time import time
55

66
import six
7-
from cassandra.cluster import Cluster
87
from cassandra.cqlengine import connection
98
from cassandra.cqlengine.management import (create_keyspace_simple,
109
drop_keyspace, drop_table,
@@ -40,19 +39,13 @@ def setUp(self):
4039
self.manager.settings = settings
4140
self.keyspace = settings.CASSANDRABACKEND_KEYSPACE
4241
self.timeout = settings.CASSANDRABACKEND_REQUEST_TIMEOUT
43-
cluster = Cluster(self.hosts, self.port)
44-
self.session = cluster.connect()
4542
self._set_global_connection(self.hosts, self.port, self.timeout)
4643
create_keyspace_simple(self.keyspace, 1)
47-
self.session.set_keyspace(self.keyspace)
48-
self.session.default_timeout = self.timeout
4944
connection.session.set_keyspace(self.keyspace)
5045

5146
def tearDown(self):
5247
self._set_global_connection(self.hosts, self.port, self.timeout)
5348
drop_keyspace(self.keyspace)
54-
self.session.shutdown()
55-
connection.unregister_connection('default')
5649

5750
def _set_global_connection(self, hosts, port, timeout):
5851
if not connection.cluster:
@@ -141,9 +134,9 @@ def assert_db_values(self, model, _filter, fields):
141134
class TestCassandraBackend(BaseCassandraTest, unittest.TestCase):
142135

143136
def _get_tables(self):
144-
query = self.session.prepare('SELECT table_name FROM system_schema.tables WHERE keyspace_name = ?')
145-
result = self.session.execute(query, (self.session.keyspace,))
146-
return [row.table_name for row in result.current_rows]
137+
query = 'SELECT table_name FROM system_schema.tables WHERE keyspace_name = \'{}\''.format(self.keyspace)
138+
result = connection.execute(query)
139+
return [row['table_name'] for row in result.current_rows]
147140

148141
def test_tables_created(self):
149142
tables_before = self._get_tables()

tests/test_utils_misc.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
from __future__ import absolute_import
22
import hashlib
33
import pytest
4-
from frontera.utils.misc import load_object, get_crc32, chunks, to_signed32
54
import six
5+
from datetime import datetime
6+
7+
from frontera.utils.misc import load_object, get_crc32, chunks, to_signed32, utcnow_timestamp
8+
from tests import mock
69

710

811
class TestGetCRC32(object):
@@ -82,3 +85,13 @@ def test_name_error(self):
8285
load_object('tests.mocks.load_objects.non_existent_object')
8386
assert str(info.value) == ("Module 'tests.mocks.load_objects' doesn't define"
8487
" any object named 'non_existent_object'")
88+
89+
90+
class TestUtcNowTimestamp(object):
91+
92+
def test(self):
93+
udt = datetime(2016, 11, 11, 0, 0, 0)
94+
with mock.patch('frontera.utils.misc.datetime') as mocked_datetime:
95+
mocked_datetime.utcnow = mock.Mock(return_value=udt)
96+
utc_tstamp = utcnow_timestamp()
97+
assert utc_tstamp == 1478822400

0 commit comments

Comments
 (0)