Replace py.test imports with pytest

Author: borntyping

tests/conftest.py

@@ -2,7 +2,7 @@
 
 import sys
 
-import py.test
+import pytest
 
 import riemann_client.transport
 
@@ -25,6 +25,6 @@ def disconnect(self):
         self.string.close()
 
 
-@py.test.fixture
+@pytest.fixture
 def string_transport():
     return StringTransport()

tests/test_riemann_auto_flushing_queued_client.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-import py.test
+import pytest
 import socket
 import time
 
@@ -9,7 +9,7 @@
 import riemann_client.transport
 
 
-@py.test.fixture
+@pytest.fixture
 def blank_transport():
     return riemann_client.transport.BlankTransport()
 
@@ -25,12 +25,12 @@ def send(self, *args, **kwargs):
         raise socket.error(32, '[Errno 32] Broken pipe')
 
 
-@py.test.fixture
+@pytest.fixture
 def broken_transport():
     return BrokenTransport()
 
 
-@py.test.fixture
+@pytest.fixture
 def auto_flushing_queued_client(request, blank_transport):
     """A Riemann client using the StringIO transport and
     AutoFlushingQueuedClient with max_delay=300 and
@@ -49,7 +49,7 @@ def disconnect():
     return client
 
 
-@py.test.fixture
+@pytest.fixture
 def auto_flushing_queued_client_delay(request, blank_transport):
     """A Riemann client using the StringIO transport and
     AutoFlushingQueuedClient with max_delay=1 and
@@ -68,7 +68,7 @@ def disconnect():
     return client
 
 
-@py.test.fixture
+@pytest.fixture
 def auto_flushing_queued_client_batch5(request, blank_transport):
     """A Riemann client using the StringIO transport and
     AutoFlushingQueuedClient with max_delay=300 and
@@ -87,7 +87,7 @@ def disconnect():
     return client
 
 
-@py.test.fixture
+@pytest.fixture
 def auto_flushing_queued_client_batch5_broken_f(request, broken_transport):
     """A Riemann client using the StringIO transport and
     AutoFlushingQueuedClient with max_delay=300 and
@@ -107,7 +107,7 @@ def disconnect():
     return client
 
 
-@py.test.fixture
+@pytest.fixture
 def auto_flushing_queued_client_batch5_broken_t(request, broken_transport):
     """A Riemann client using the StringIO transport and
     AutoFlushingQueuedClient with max_delay=300 and
@@ -127,13 +127,13 @@ def disconnect():
     return client
 
 
-@py.test.fixture
+@pytest.fixture
 def using_simple_queue(auto_flushing_queued_client):
     """An event queue with a single event"""
     auto_flushing_queued_client.event(service='test')
 
 
-@py.test.fixture
+@pytest.fixture
 def large_queue(auto_flushing_queued_client):
     """An event queue with 100 events"""
     items = ['-->{0}<--'.format(i) for i in range(0, 1000)]

tests/test_riemann_client.py

@@ -4,7 +4,7 @@
 import sys
 import uuid
 
-import py.test
+import pytest
 
 import riemann_client.client
 import riemann_client.riemann_pb2
@@ -14,7 +14,7 @@
     basestring = str
 
 
-@py.test.fixture
+@pytest.fixture
 def client(request, string_transport):
     client = riemann_client.client.Client(transport=string_transport)
     client.transport.connect()
@@ -26,7 +26,7 @@ def disconnect():
     return client
 
 
-@py.test.fixture
+@pytest.fixture
 def unique():
     return str(uuid.uuid4())
 
@@ -68,7 +68,7 @@ def test_udp_query(self):
         transport = riemann_client.transport.UDPTransport()
         client = riemann_client.client.Client(transport)
 
-        with py.test.raises(Exception):
+        with pytest.raises(Exception):
             client.query('true')
 
     def test_events(self, client):
@@ -81,7 +81,7 @@ def test_events_len(self, client):
         assert len(message.events) == 2
 
 
-@py.test.fixture
+@pytest.fixture
 def event(unique):
     return riemann_client.client.Client.create_event({
         'host': 'test.example.com',
@@ -104,7 +104,7 @@ def test_attributes(self, event, unique):
         assert event.attributes[0].value == unique
 
 
-@py.test.fixture
+@pytest.fixture
 def event_as_dict(event):
     return riemann_client.client.Client.create_dict(event)
 

tests/test_riemann_queued_client.py

@@ -1,13 +1,13 @@
 from __future__ import absolute_import
 
-import py.test
+import pytest
 
 import riemann_client.client
 import riemann_client.riemann_pb2
 import riemann_client.transport
 
 
-@py.test.fixture
+@pytest.fixture
 def queued_client(request, string_transport):
     """A Riemann client using the StringIO transport and QueuedClient"""
     client = riemann_client.client.QueuedClient(transport=string_transport)
@@ -20,13 +20,13 @@ def disconnect():
     return client
 
 
-@py.test.fixture
+@pytest.fixture
 def using_simple_queue(queued_client):
     """An event queue with a single event"""
     queued_client.event(service='test')
 
 
-@py.test.fixture
+@pytest.fixture
 def large_queue(queued_client):
     """An event queue with 100 events"""
     items = ['-->{0}<--'.format(i) for i in range(0, 1000)]

tests/test_riemann_transport.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-import py.test
+import pytest
 
 import riemann_client.riemann_pb2
 import riemann_client.transport
@@ -24,13 +24,13 @@ def test_socket_recvall_short():
     assert socket_recvall(FakeSocket(), 5) == b'hello'
 
 
-@py.test.fixture
+@pytest.fixture
 def tcp_transport():
     return riemann_client.transport.TCPTransport()
 
 
 def test_not_yet_connected(tcp_transport):
-    with py.test.raises(RuntimeError):
+    with pytest.raises(RuntimeError):
         tcp_transport.send(riemann_client.riemann_pb2.Msg())