check if not necessary to sort settings lists (#8573)

* check if not necessary to sort settings lists * try fixing tests * fixing test
conan-io · Mar 2, 2021 · 36d0a07 · 36d0a07
1 parent 9a173b0
commit 36d0a07
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/conans/model/settings.py b/conans/model/settings.py
@@ -45,7 +45,7 @@ def __init__(self, definition, name):
             self._definition = "ANY"
         else:
             # list or tuple of possible values
-            self._definition = sorted(str(v) for v in definition)
+            self._definition = [str(v) for v in definition]
 
     def __contains__(self, value):
         return value in (self._value or "")

diff --git a/conans/test/functional/generators/cmake_test.py b/conans/test/functional/generators/cmake_test.py
@@ -429,9 +429,9 @@ def build(self):
                         self.assertIn("comp compile options: one;two;three;four", client.out)
                     else:
                         self.assertIn("$<$<CONFIG:Debug>:;>;"
-                                      "$<$<CONFIG:MinSizeRel>:;>;"
+                                      "$<$<CONFIG:Release>:;one;two;three;four>;"
                                       "$<$<CONFIG:RelWithDebInfo>:;>;"
-                                      "$<$<CONFIG:Release>:;one;two;three;four>"
+                                      "$<$<CONFIG:MinSizeRel>:;>"
                                       , client.out)
             else:
                 generate_files({"cflags": ["one", "two"], "cxxflags": ["three", "four"]},

diff --git a/conans/test/integration/settings/cppstd_test.py b/conans/test/integration/settings/cppstd_test.py
@@ -23,7 +23,7 @@ class TestConan(ConanFile):
                    '-s compiler.version="4.6" -s cppstd=17', assert_error=True)
 
         self.assertIn("The specified 'cppstd=17' is not available for 'gcc 4.6'", client.out)
-        self.assertIn("Possible values are ['11', '98', 'gnu11', 'gnu98']", client.out)
+        self.assertIn("Possible values are ['98', 'gnu98', '11', 'gnu11']", client.out)
 
         client.run('create . user/testing -s compiler="gcc" -s compiler.libcxx="libstdc++11" '
                    '-s compiler.version="6.3" -s cppstd=17')

diff --git a/conans/test/unittests/model/settings_test.py b/conans/test/unittests/model/settings_test.py
@@ -327,7 +327,7 @@ def test_constraint3(self):
         with self.assertRaises(ConanException) as cm:
             self.sut.constraint(s2)
         self.assertEqual(str(cm.exception),
-                         bad_value_msg("os", "Win", ["Linux", "Windows"]))
+                         bad_value_msg("os", "Win", ["Windows", "Linux"]))
 
     def test_constraint4(self):
         s2 = {"os": ["Windows"]}