From 95432a9466520e59aafbb663a7cfb226fa8be0f9 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Wed, 21 May 2025 20:48:20 +0200
Subject: [PATCH] tests: move tests to testsuite.helpers.msgpack_test

---
 src/borg/testsuite/helpers/msgpack_test.py | 36 ++++++++++++++++++++++
 src/borg/testsuite/helpers_test.py         | 34 --------------------
 2 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 src/borg/testsuite/helpers/msgpack_test.py

diff --git a/src/borg/testsuite/helpers/msgpack_test.py b/src/borg/testsuite/helpers/msgpack_test.py
new file mode 100644
index 000000000..fe14a3a58
--- /dev/null
+++ b/src/borg/testsuite/helpers/msgpack_test.py
@@ -0,0 +1,36 @@
+import sys
+import pytest
+
+from ...helpers.msgpack import is_slow_msgpack
+from ...platform import is_cygwin
+
+
+def expected_py_mp_slow_combination():
+    """do we expect msgpack to be slow in this environment?"""
+    # we need to import upstream msgpack package here, not helpers.msgpack:
+    import msgpack
+
+    # msgpack is slow on cygwin
+    if is_cygwin:
+        return True
+    # msgpack < 1.0.6 did not have py312 wheels
+    if sys.version_info[:2] == (3, 12) and msgpack.version < (1, 0, 6):
+        return True
+    # otherwise we expect msgpack to be fast!
+    return False
+
+
+@pytest.mark.skipif(expected_py_mp_slow_combination(), reason="ignore expected slow msgpack")
+def test_is_slow_msgpack():
+    # we need to import upstream msgpack package here, not helpers.msgpack:
+    import msgpack
+    import msgpack.fallback
+
+    saved_packer = msgpack.Packer
+    try:
+        msgpack.Packer = msgpack.fallback.Packer
+        assert is_slow_msgpack()
+    finally:
+        msgpack.Packer = saved_packer
+    # this tests that we have fast msgpack on test platform:
+    assert not is_slow_msgpack()
diff --git a/src/borg/testsuite/helpers_test.py b/src/borg/testsuite/helpers_test.py
index 640c630cf..9d82ae98c 100644
--- a/src/borg/testsuite/helpers_test.py
+++ b/src/borg/testsuite/helpers_test.py
@@ -1,4 +1,3 @@
-import sys
 from argparse import ArgumentTypeError
 from datetime import datetime, timezone
 from io import StringIO, BytesIO
@@ -10,9 +9,7 @@ from ..constants import *  # NOQA
 from ..helpers import ChunkIteratorFileWrapper, ChunkerParams
 from ..helpers import chunkit
 from ..helpers import iter_separated
-from ..helpers import is_slow_msgpack
 from ..helpers import classify_ec, max_ec
-from ..platform import is_cygwin
 
 
 @pytest.mark.parametrize(
@@ -154,37 +151,6 @@ def test_prune_split_no_archives():
     assert kept_because == {}
 
 
-def expected_py_mp_slow_combination():
-    """do we expect msgpack to be slow in this environment?"""
-    # we need to import upstream msgpack package here, not helpers.msgpack:
-    import msgpack
-
-    # msgpack is slow on cygwin
-    if is_cygwin:
-        return True
-    # msgpack < 1.0.6 did not have py312 wheels
-    if sys.version_info[:2] == (3, 12) and msgpack.version < (1, 0, 6):
-        return True
-    # otherwise we expect msgpack to be fast!
-    return False
-
-
-@pytest.mark.skipif(expected_py_mp_slow_combination(), reason="ignore expected slow msgpack")
-def test_is_slow_msgpack():
-    # we need to import upstream msgpack package here, not helpers.msgpack:
-    import msgpack
-    import msgpack.fallback
-
-    saved_packer = msgpack.Packer
-    try:
-        msgpack.Packer = msgpack.fallback.Packer
-        assert is_slow_msgpack()
-    finally:
-        msgpack.Packer = saved_packer
-    # this tests that we have fast msgpack on test platform:
-    assert not is_slow_msgpack()
-
-
 def test_chunk_file_wrapper():
     cfw = ChunkIteratorFileWrapper(iter([b"abc", b"def"]))
     assert cfw.read(2) == b"ab"