Merge pull request #870 from jd/remove-nose

[testing] Remove nose usage

Author: jd

.gitignore

@@ -41,7 +41,6 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
-nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/

setup.cfg

@@ -1,5 +1,2 @@
-[nosetests]
-verbosity=1
-
 [bdist_wheel]
 universal=1

tests/commands/ddtrace_run_argv.py

@@ -1,6 +1,5 @@
-from nose.tools import eq_
 import sys
 
 if __name__ == '__main__':
-    eq_(sys.argv[1:], ['foo', 'bar'])
+    assert sys.argv[1:] == ['foo', 'bar']
     print('Test success')

tests/commands/ddtrace_run_debug.py

@@ -1,7 +1,5 @@
 from ddtrace import tracer
 
-from nose.tools import ok_
-
 if __name__ == '__main__':
-    ok_(tracer.debug_logging)
+    assert tracer.debug_logging
     print("Test success")

tests/commands/ddtrace_run_disabled.py

@@ -1,8 +1,6 @@
 from ddtrace import tracer, monkey
 
-from nose.tools import ok_, eq_
-
 if __name__ == '__main__':
-    ok_(not tracer.enabled)
-    eq_(len(monkey.get_patched_modules()), 0)
+    assert not tracer.enabled
+    assert len(monkey.get_patched_modules()) == 0
     print("Test success")

tests/commands/ddtrace_run_enabled.py

@@ -1,7 +1,5 @@
 from ddtrace import tracer
 
-from nose.tools import ok_
-
 if __name__ == '__main__':
-    ok_(tracer.enabled)
+    assert tracer.enabled
     print("Test success")

tests/commands/ddtrace_run_env.py

@@ -1,7 +1,5 @@
 from ddtrace import tracer
 
-from nose.tools import eq_
-
 if __name__ == '__main__':
-    eq_(tracer.tags['env'], 'test')
+    assert tracer.tags['env'] == 'test'
     print('Test success')

tests/commands/ddtrace_run_hostname.py

@@ -1,8 +1,6 @@
 from ddtrace import tracer
 
-from nose.tools import eq_
-
 if __name__ == '__main__':
-    eq_(tracer.writer.api.hostname, "172.10.0.1")
-    eq_(tracer.writer.api.port, 8120)
+    assert tracer.writer.api.hostname == "172.10.0.1"
+    assert tracer.writer.api.port == 8120
     print("Test success")

tests/commands/ddtrace_run_integration.py

@@ -9,40 +9,38 @@
 from tests.contrib.config import REDIS_CONFIG
 from tests.test_tracer import DummyWriter
 
-from nose.tools import eq_, ok_
-
 if __name__ == '__main__':
     r = redis.Redis(port=REDIS_CONFIG['port'])
     pin = Pin.get_from(r)
-    ok_(pin)
-    eq_(pin.app, 'redis')
-    eq_(pin.service, 'redis')
+    assert pin
+    assert pin.app == 'redis'
+    assert pin.service == 'redis'
 
     pin.tracer.writer = DummyWriter()
     r.flushall()
     spans = pin.tracer.writer.pop()
 
-    eq_(len(spans), 1)
-    eq_(spans[0].service, 'redis')
-    eq_(spans[0].resource, 'FLUSHALL')
+    assert len(spans) == 1
+    assert spans[0].service == 'redis'
+    assert spans[0].resource == 'FLUSHALL'
 
     long_cmd = "mget %s" % " ".join(map(str, range(1000)))
     us = r.execute_command(long_cmd)
 
     spans = pin.tracer.writer.pop()
-    eq_(len(spans), 1)
+    assert len(spans) == 1
     span = spans[0]
-    eq_(span.service, 'redis')
-    eq_(span.name, 'redis.command')
-    eq_(span.span_type, 'redis')
-    eq_(span.error, 0)
+    assert span.service == 'redis'
+    assert span.name == 'redis.command'
+    assert span.span_type == 'redis'
+    assert span.error == 0
     meta = {
         'out.host': u'localhost',
         'out.port': str(REDIS_CONFIG['port']),
         'out.redis_db': u'0',
     }
     for k, v in meta.items():
-        eq_(span.get_tag(k), v)
+        assert span.get_tag(k) == v
 
     assert span.get_tag('redis.raw_command').startswith(u'mget 0 1 2 3')
     assert span.get_tag('redis.raw_command').endswith(u'...')

tests/commands/ddtrace_run_no_debug.py

@@ -1,7 +1,5 @@
 from ddtrace import tracer
 
-from nose.tools import ok_
-
 if __name__ == '__main__':
-    ok_(not tracer.debug_logging)
+    assert not tracer.debug_logging
     print("Test success")