Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies:
- pip2.7 install -U setuptools
- pip3.4 install -U setuptools
# Pre-install all dependencies
# FIXME[matt] django install started failing on 2.7 because it was choking
# on a unicode path error
- pip2.7 install django
- python2.7 setup.py test -n
- python3.4 setup.py test -n
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
'nose',
# contrib
'blinker',
'cassandra-driver',
'cassandra-driver==3.6.0',
'django',
'elasticsearch',
'flask',
Expand Down
15 changes: 6 additions & 9 deletions tests/contrib/cassandra/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,10 @@ def test_get_traced_cassandra(self):
spans = writer.pop()
assert spans

# Should be sending one request to "USE <keyspace>" and another for the actual query
eq_(len(spans), 2)
use, query = spans[0], spans[1]
eq_(use.service, "cassandra")
eq_(use.resource, "USE %s" % self.TEST_KEYSPACE)
# another for the actual query
eq_(len(spans), 1)

query = spans[0]
eq_(query.service, "cassandra")
eq_(query.resource, self.TEST_QUERY)
eq_(query.span_type, cassx.TYPE)
Expand All @@ -88,9 +86,8 @@ def test_trace_with_service(self):
result = session.execute(self.TEST_QUERY)
spans = writer.pop()
assert spans
eq_(len(spans), 2)
use, query = spans[0], spans[1]
eq_(use.service, "custom")
eq_(len(spans), 1)
query = spans[0]
eq_(query.service, "custom")

def test_trace_error(self):
Expand All @@ -102,7 +99,7 @@ def test_trace_error(self):

spans = writer.pop()
assert spans
use, query = spans[0], spans[1]
query = spans[0]
eq_(query.error, 1)
for k in (errx.ERROR_MSG, errx.ERROR_TYPE, errx.ERROR_STACK):
assert query.get_tag(k)
Expand Down