When the layout, use different folder for the 'conan infos' files

conans/client/cmd/test.py

@@ -24,18 +24,22 @@ def install_build_and_test(app, conanfile_abs_path, reference, graph_info,
         # Don't use "test_package/build/HASH/" as the build_f
         delete_after_build = False
         test_build_folder = base_folder
+        # Don't mess the test_package folder with the conaninfo.txt and others
+        # We don't have the conanfile loaded yet so we cannot know the generators_folder
+        install_folder = os.path.join(base_folder, "install")
     else:
         test_build_folder, delete_after_build = _build_folder(test_build_folder,
                                                               graph_info.profile_host,
                                                               base_folder)
         rmdir(test_build_folder)
+        install_folder = test_build_folder
     if build_modes is None:
         build_modes = ["never"]
     try:
         deps_install(app=app,
                      create_reference=reference,
                      ref_or_path=conanfile_abs_path,
-                     install_folder=test_build_folder,
+                     install_folder=install_folder,
                      base_folder=test_build_folder,
                      remotes=remotes,
                      graph_info=graph_info,
@@ -53,7 +57,7 @@ def install_build_and_test(app, conanfile_abs_path, reference, graph_info,
         cmd_build(app, conanfile_abs_path, test_build_folder,
                   source_folder=base_folder, build_folder=test_build_folder,
                   package_folder=os.path.join(test_build_folder, "package"),
-                  install_folder=test_build_folder, test=reference)
+                  install_folder=install_folder, test=reference)
     finally:
         if delete_after_build:
             # Required for windows where deleting the cwd is not possible.

conans/model/conan_file.py

@@ -311,7 +311,8 @@ def install_folder(self):
     @property
     def generators_folder(self):
         # FIXME: Remove in 2.0, no self.install_folder
-        return self.folders.generators_folder if self.folders.generators else self.install_folder
+        return self.folders.generators_folder \
+            if self.folders.generators is not None else self.install_folder
 
     @property
     def generators_path(self) -> Path:

conans/model/layout.py

@@ -26,7 +26,7 @@ def __init__(self):
         self.source = ""
         self.build = ""
         self.package = ""
-        self.generators = ""
+        self.generators = None  # None so in Conan 1.X we know when to fallback to install folder
         self.imports = ""
         # Relative location of the project root, if the conanfile is not in that project root, but
         # in a subfolder: e.g: If the conanfile is in a subfolder then self.root = ".."

conans/test/functional/command/test_command_test.py

@@ -1,3 +1,4 @@
+import os.path
 import time
 import unittest
 
@@ -25,3 +26,5 @@ def test_conan_test(self):
         client.run("test test_package hello/0.1@lasote/stable -s hello:build_type=Debug "
                    "--build missing")
         self.assertIn('hello/0.1: Hello World Debug!', client.out)
+        assert os.path.exists(os.path.join(client.current_folder, "test_package",
+                                           "install", "conaninfo.txt"))