Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37725997
en ru br
ALT Linux repos
S:2.0.8-alt1

Group :: System/Libraries
RPM: conan

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Patch: conan-2.0.8-alt.patch
Download


 conans/test/conftest.py                             | 6 ++++--
 conans/test/unittests/tools/files/test_downloads.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/conans/test/conftest.py b/conans/test/conftest.py
index 648071722..223ba50b5 100644
--- a/conans/test/conftest.py
+++ b/conans/test/conftest.py
@@ -181,8 +181,10 @@ tools_locations = {
 
 
 # TODO: Make this match the default tools (compilers) above automatically
-arch = platform.machine()
-arch_setting = "armv8" if arch in ["arm64", "aarch64"] else arch
+from conans.client.conf.detect import _detected_architecture
+arch_setting = _detected_architecture()
+assert arch_setting is not None
+
 default_profiles = {
     "Windows": textwrap.dedent("""\
         [settings]
diff --git a/conans/test/unittests/tools/files/test_downloads.py b/conans/test/unittests/tools/files/test_downloads.py
index e837f5278..0f75ed6ee 100644
--- a/conans/test/unittests/tools/files/test_downloads.py
+++ b/conans/test/unittests/tools/files/test_downloads.py
@@ -12,7 +12,7 @@ from conans.test.utils.tools import StoppableThreadBottle, redirect_output
 from conans.util.files import save, load, chdir
 
 
-@pytest.mark.skip(msg="This causes more troubles than benefits, external ftp download is testing "
+@pytest.mark.skip(reason="This causes more troubles than benefits, external ftp download is testing "
                       "very little conan code, mostly python")
 class TestFTP:
 
 
design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
current maintainer: Michael Shigorin