move some tests (#6256)

conan-io · Dec 18, 2019 · 9951a2e · 9951a2e
1 parent 7175a56
commit 9951a2e
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 39 deletions.
diff --git a/conans/test/functional/conan_build_info/__init__.py b/conans/test/functional/conan_build_info/__init__.py
diff --git a/...t/integration/test_build_info_creation.py → ...an_build_info/test_build_info_creation.py b/...t/integration/test_build_info_creation.py → ...an_build_info/test_build_info_creation.py
diff --git a/...integration/test_build_info_extraction.py → ..._build_info/test_build_info_extraction.py b/...integration/test_build_info_extraction.py → ..._build_info/test_build_info_extraction.py
diff --git a/...est/integration/build_environment_test.py → ...nal/environment/build_environment_test.py b/...est/integration/build_environment_test.py → ...nal/environment/build_environment_test.py
diff --git a/.../test/integration/run_environment_test.py → ...ional/environment/run_environment_test.py b/.../test/integration/run_environment_test.py → ...ional/environment/run_environment_test.py
diff --git a/conans/test/functional/graph/graph_manager_test.py b/conans/test/functional/graph/graph_manager_test.py
@@ -196,54 +196,41 @@ def test_multiple_transitive(self):
     def test_diamond_conflict(self):
         # app -> libb0.1 -> liba0.1
         #    \-> libc0.1 -> liba0.2
-        liba_ref = ConanFileReference.loads("liba/0.1@user/testing")
-        liba_ref2 = ConanFileReference.loads("liba/0.2@user/testing")
-        libb_ref = ConanFileReference.loads("libb/0.1@user/testing")
-        libc_ref = ConanFileReference.loads("libc/0.1@user/testing")
-        self._cache_recipe(liba_ref, GenConanfile().with_name("liba").with_version("0.1"))
-        self._cache_recipe(liba_ref2, GenConanfile().with_name("liba").with_version("0.2"))
-        self._cache_recipe(libb_ref, GenConanfile().with_name("libb").with_version("0.1")
-                                                   .with_require(liba_ref))
-        self._cache_recipe(libc_ref, GenConanfile().with_name("libc").with_version("0.1")
-                                                   .with_require(liba_ref2))
-        with six.assertRaisesRegex(self, ConanException,
-                                   "Requirement liba/0.2@user/testing conflicts"):
-            self.build_graph(GenConanfile().with_name("app").with_version("0.1")
-                                           .with_require(libb_ref)
-                                           .with_require(libc_ref))
+        self.recipe_cache("liba/0.1")
+        self.recipe_cache("liba/0.2")
+        self.recipe_cache("libb/0.1", ["liba/0.1"])
+        self.recipe_cache("libc/0.1", ["liba/0.2"])
+
+        consumer = self.recipe_consumer("app/0.1", ["libb/0.1", "libc/0.1"])
+
+        with six.assertRaisesRegex(self, ConanException, "Requirement liba/0.2 conflicts"):
+            self.build_consumer(consumer)
 
     def test_loop(self):
         # app -> libc0.1 -> libb0.1 -> liba0.1 ->|
         #             \<-------------------------|
-        liba_ref = ConanFileReference.loads("liba/0.1@user/testing")
-        libb_ref = ConanFileReference.loads("libb/0.1@user/testing")
-        libc_ref = ConanFileReference.loads("libc/0.1@user/testing")
-        self._cache_recipe(liba_ref, GenConanfile().with_name("liba").with_version("0.1")
-                                                   .with_require(libc_ref))
-        self._cache_recipe(libb_ref, GenConanfile().with_name("libb").with_version("0.1")
-                                                   .with_require(liba_ref))
-        self._cache_recipe(libc_ref, GenConanfile().with_name("libc").with_version("0.1")
-                                                   .with_require(libb_ref))
-        with six.assertRaisesRegex(self, ConanException, "Loop detected: 'liba/0.1@user/testing' "
-                                   "requires 'libc/0.1@user/testing'"):
-            self.build_graph(GenConanfile().with_name("app").with_version("0.1")
-                                           .with_require(libc_ref))
+        self.recipe_cache("liba/0.1", ["libc/0.1"])
+        self.recipe_cache("libb/0.1", ["liba/0.1"])
+        self.recipe_cache("libc/0.1", ["libb/0.1"])
+
+        consumer = self.recipe_consumer("app/0.1", ["libc/0.1"])
+
+        with six.assertRaisesRegex(self, ConanException,
+                                   "Loop detected: 'liba/0.1' requires 'libc/0.1'"):
+            self.build_consumer(consumer)
 
     def test_self_loop(self):
-        ref1 = ConanFileReference.loads("base/1.0@user/testing")
-        self._cache_recipe(ref1, GenConanfile().with_name("base").with_version("0.1"))
-        ref = ConanFileReference.loads("base/aaa@user/testing")
-        with six.assertRaisesRegex(self, ConanException, "Loop detected: 'base/aaa@user/testing' "
-                                   "requires 'base/aaa@user/testing'"):
-            self.build_graph(GenConanfile().with_name("base").with_version("aaa")
-                                           .with_require(ref1), ref=ref, create_ref=ref)
+        self.recipe_cache("liba/0.1")
+        consumer = self.recipe_consumer("liba/0.2", ["liba/0.1"])
+        with six.assertRaisesRegex(self, ConanException,
+                                   "Loop detected: 'liba/0.2' requires 'liba/0.1'"):
+            self.build_consumer(consumer)
 
     @parameterized.expand([("recipe", ), ("profile", )])
     def test_basic_build_require(self, build_require):
         # app -(br)-> tool0.1
         tool_ref = ConanFileReference.loads("tool/0.1@user/testing")
-        self._cache_recipe(tool_ref, GenConanfile().with_name("tool")
-                                                                  .with_version("0.1"))
+        self._cache_recipe(tool_ref, GenConanfile().with_name("tool").with_version("0.1"))
         if build_require == "recipe":
             deps_graph = self.build_graph(GenConanfile().with_name("app").with_version("0.1")
                                                         .with_build_require(tool_ref))

diff --git a/conans/test/functional/options/__init__.py b/conans/test/functional/options/__init__.py
diff --git a/conans/test/integration/options_test.py → ...s/test/functional/options/options_test.py b/conans/test/integration/options_test.py → ...s/test/functional/options/options_test.py
@@ -1,10 +1,8 @@
-import os
 import textwrap
 import unittest
 
 from conans.paths import CONANINFO
 from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, GenConanfile
-from conans.util.files import load
 
 
 class OptionsTest(unittest.TestCase):

diff --git a/...t/integration/test_package_config_test.py → ...ional/options/test_package_config_test.py b/...t/integration/test_package_config_test.py → ...ional/options/test_package_config_test.py
diff --git a/conans/test/integration/package_id_test.py → ...kage_id/package_id_requires_modes_test.py b/conans/test/integration/package_id_test.py → ...kage_id/package_id_requires_modes_test.py
diff --git a/.../functional/old/remove_subsetting_test.py → ...tional/settings/remove_subsetting_test.py b/.../functional/old/remove_subsetting_test.py → ...tional/settings/remove_subsetting_test.py