diff options
| author |   Matti Picus <matti.picus@gmail.com> | 2024-01-09 23:07:39 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-01-09 23:07:39 +0200 |
| commit | 1e67d7c50e371d8c13bc7a44201ca1818b1681a7 (patch) | |
| tree | 00336877933d9383989bfaacedc4fd86d63aca70 | |
| parent | Merge branch 'branches/jit-tail-call-optimization' (diff) | |
| parent | add missing import (diff) | |
| download | pypy-1e67d7c50e371d8c13bc7a44201ca1818b1681a7.tar.gz pypy-1e67d7c50e371d8c13bc7a44201ca1818b1681a7.tar.bz2 pypy-1e67d7c50e371d8c13bc7a44201ca1818b1681a7.zip | |
Merge pull request #4842 from mattip/flaky
skip flaky test on CI
| -rw-r--r-- | .github/workflows/translate.yml | 2 | ||||
| -rw-r--r-- | pypy/conftest.py | 2 | ||||
| -rw-r--r-- | pypy/objspace/std/test/test_methodcache.py | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/translate.yml b/.github/workflows/translate.yml index 22c1de9eb2..5eb1a758ee 100644 --- a/.github/workflows/translate.yml +++ b/.github/workflows/translate.yml @@ -36,7 +36,7 @@ jobs: - name: run objspace unit tests run: | - pypy pytest.py pypy/objspace -v + pypy pytest.py pypy/objspace -v -m "not flaky" - name: translate run: | diff --git a/pypy/conftest.py b/pypy/conftest.py index dd0679f862..ea0292a77f 100644 --- a/pypy/conftest.py +++ b/pypy/conftest.py @@ -60,6 +60,8 @@ def pytest_configure(config): if not mode_A and not mode_D: # 'own' tests from rpython.conftest import LeakFinder config.pluginmanager.register(LeakFinder()) + config.addinivalue_line("markers", "flaky: test that sometimes fails") + def pytest_addoption(parser): group = parser.getgroup("pypy options") diff --git a/pypy/objspace/std/test/test_methodcache.py b/pypy/objspace/std/test/test_methodcache.py index 820a53e058..73812efbb3 100644 --- a/pypy/objspace/std/test/test_methodcache.py +++ b/pypy/objspace/std/test/test_methodcache.py @@ -1,3 +1,4 @@ +import pytest from pypy.objspace.std.test import test_typeobject @@ -93,6 +94,7 @@ class AppTestMethodCaching(test_typeobject.AppTestTypeObject): assert cache_counter[1] >= 3 # should be (27, 3) assert sum(cache_counter) == 30 + @pytest.mark.flaky def test_many_names(self): @self.retry def run(): |