summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Parise <jon@pinterest.com>2020-08-13 10:13:20 -0700
committerGitHub <noreply@github.com>2020-08-13 10:13:20 -0700
commit1eb73468c92ba21397b986096c35c5244e3816de (patch)
treecd78a78f55918fcb11ef96bce5ca6f9761b69e87
parent209855d56f5be5b9bf479acab0fb55f99aeeab18 (diff)
downloadpymemcache-1eb73468c92ba21397b986096c35c5244e3816de.tar.gz
Fix incorrect pytest mark (#290)
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--pymemcache/test/test_integration.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e9125e..da57fe6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
run: |
pip install -r test-requirements.txt
py.test pymemcache/test/ \
- -m unit,integration \
+ -m 'unit or integration' \
--port ${{ job.services.memcached.ports[11211] }} \
--tls-port ${{ job.services.tls_memcached.ports[11211] }}
diff --git a/pymemcache/test/test_integration.py b/pymemcache/test/test_integration.py
index ddd08cc..c5fd7a3 100644
--- a/pymemcache/test/test_integration.py
+++ b/pymemcache/test/test_integration.py
@@ -183,7 +183,7 @@ def test_gets(client_class, host, port, socket_module):
assert result[0] == b'value'
-@pytest.mark.delete()
+@pytest.mark.integration()
def test_delete(client_class, host, port, socket_module):
client = client_class((host, port), socket_module=socket_module)
client.flush_all()