Fix zerorpc tests, move them to separate test env (#581)

zerorpc tests are currently being skipped all of the time because of an incorrect gevent version
specified. The line `zerorpc = pytest.importorskip("zerorpc")` actually raises an `ImportError`
on it's dependency `gevent`, NOT on `zerorpc` itself.

Author: ramshaw888

.ci/.jenkins_exclude.yml

@@ -154,3 +154,16 @@ exclude:
   # eventlet
   - PYTHON_VERSION: pypy-2  #currently fails on pypy2
     FRAMEWORK: eventlet-newest
+  # zerorpc - only run on py2
+  - PYTHON_VERSION: pypy-3
+    FRAMEWORK: zerorpc-0.4
+  - PYTHON_VERSION: python-3.4
+    FRAMEWORK: zerorpc-0.4
+  - PYTHON_VERSION: python-3.5
+    FRAMEWORK: zerorpc-0.4
+  - PYTHON_VERSION: python-3.6
+    FRAMEWORK: zerorpc-0.4
+  - PYTHON_VERSION: python-3.7
+    FRAMEWORK: zerorpc-0.4
+  - PYTHON_VERSION: python-3.8-rc
+    FRAMEWORK: zerorpc-0.4

.ci/.jenkins_framework.yml

@@ -28,4 +28,5 @@ FRAMEWORK:
   - cassandra-newest
   - psutil-newest
   - eventlet-newest
+  - zerorpc-0.4
 

.ci/.jenkins_framework_full.yml

@@ -59,3 +59,4 @@ FRAMEWORK:
   - elasticsearch-5
   - elasticsearch-6
   - elasticsearch-7
+  - zerorpc-0.4

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 ### Bugfixes
  * fixed an issue with http server_url and `'VERIFY_SERVER_CERT': False` (#570, #578)
+ * fixed zerorpc tests (#581)
 
 ## v5.1.1 
 [Check the diff](https://github.com/elastic/apm-agent-python/compare/v5.1.0...v5.1.1)

setup.py

@@ -128,16 +128,14 @@ def get_version():
 ]
 
 if sys.version_info[0] == 2:
-    tests_require += ["unittest2", "gevent", "zerorpc>=0.4.0,<0.5", "python-memcached"]
+    tests_require += ["unittest2", "python-memcached"]
 else:
     tests_require += ["python3-memcached"]
 
 
 try:
     import __pypy__
 except ImportError:
-    if sys.version_info[0] == 2 and "SKIP_ZERORPC" not in os.environ:
-        tests_require += ["zerorpc>=0.4.0,<0.5"]
     tests_require += ["psycopg2"]
 
 if sys.version_info >= (3, 5):

tests/contrib/zerorpc/zeropc_tests.py

@@ -36,16 +36,18 @@
 
 import pytest
 
+from elasticapm.conf.constants import ERROR
 from elasticapm.contrib.zerorpc import Middleware
 
+pytestmark = [
+    pytest.mark.zerorpc,
+    pytest.mark.skipif(sys.version_info >= (3, 4), reason="zerorpc>=0.4.0,0.5 not python 3 compatible"),
+]
+
 zerorpc = pytest.importorskip("zerorpc")
 gevent = pytest.importorskip("gevent")
 
 
-has_unsupported_pypy = hasattr(sys, "pypy_version_info") and sys.pypy_version_info < (2, 6)
-
-
-@pytest.mark.skipif(has_unsupported_pypy, reason="Failure with pypy < 2.6")
 def test_zerorpc_middleware_with_reqrep(elasticapm_client):
     tmpdir = tempfile.mkdtemp()
     server_endpoint = "ipc://{0}".format(os.path.join(tmpdir, "random_zeroserver"))
@@ -68,9 +70,9 @@ def test_zerorpc_middleware_with_reqrep(elasticapm_client):
     ex = excinfo.value
     assert ex.name == "IndexError"
     assert len(elasticapm_client.events) == 1
-    exc = elasticapm_client.events[0]["errors"][0]["exception"]
+    exc = elasticapm_client.events[ERROR][0]["exception"]
     assert exc["type"] == "IndexError"
     frames = exc["stacktrace"]
     assert frames[0]["function"] == "choice"
     assert frames[0]["module"] == "random"
-    assert elasticapm_client.events[0]["errors"][0]["exception"]["handled"] is False
+    assert exc["handled"] is False

tests/requirements/requirements-base.txt

@@ -39,7 +39,4 @@ aiohttp ; python_version >= '3.5'
 pytest-asyncio ; python_version >= '3.5'
 asynctest==0.12.2 ; python_version >= '3.5'
 
-pyzmq==16.0.2 ; python_version == '2.7'
-gevent==1.2.2 ; python_version == '2.7'
-zerorpc>=0.4.0,<0.5 ; python_version == '2.7'
 cachetools==2.0.1 ; python_version == '2.7'

tests/requirements/requirements-zerorpc-0.4.txt

@@ -0,0 +1,4 @@
+pyzmq==16.0.2 ; python_version == '2.7'
+gevent<1.2.0 ; python_version == '2.7'
+zerorpc>=0.4.0,<0.5 ; python_version == '2.7'
+-r requirements-base.txt

tests/scripts/envs/zerorpc.sh

@@ -0,0 +1 @@
+export PYTEST_MARKER="-m zerorpc"