Preserve previous method structure

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Author: uilianries

test/functional/command/test_install_deploy.py

@@ -437,78 +437,79 @@ def test_deploy_incorrect_folder():
         assert "ERROR: Deployer folder cannot be created" in c.out
 
 
-def test_runtime_deploy():
-    c = TestClient()
-    conanfile = textwrap.dedent("""
-       from conan import ConanFile
-       from conan.tools.files import copy
-       class Pkg(ConanFile):
-           package_type = "shared-library"
-           def package(self):
-               copy(self, "*.so", src=self.build_folder, dst=self.package_folder)
-               copy(self, "*.dll", src=self.build_folder, dst=self.package_folder)
-       """)
-    c.save({"pkga/conanfile.py": conanfile,
-            "pkga/lib/pkga.so": "",
-            "pkga/bin/pkga.dll": "",
-            "pkgb/conanfile.py": conanfile,
-            "pkgb/lib/pkgb.so": ""})
-    c.run("export-pkg pkga --name=pkga --version=1.0")
-    c.run("export-pkg pkgb --name=pkgb --version=1.0")
-    c.run("install --requires=pkga/1.0 --requires=pkgb/1.0 --deployer=runtime_deploy "
-          "--deployer-folder=myruntime -vvv")
-
-    expected = sorted(["pkga.so", "pkgb.so", "pkga.dll"])
-    assert sorted(os.listdir(os.path.join(c.current_folder, "myruntime"))) == expected
-
-def test_runtime_not_deploy():
-    # https://github.com/conan-io/conan/issues/16712
-    # If no run=False (no package-type), then no runtime is deployed
-    c = TestClient()
-    conanfile = textwrap.dedent("""
-       from conan import ConanFile
-       from conan.tools.files import copy
-       class Pkg(ConanFile):
-           def package(self):
-               copy(self, "*.so", src=self.build_folder, dst=self.package_folder)
-               copy(self, "*.dll", src=self.build_folder, dst=self.package_folder)
-       """)
-    c.save({"pkga/conanfile.py": conanfile,
-            "pkga/lib/pkga.so": "",
-            "pkga/bin/pkga.dll": ""})
-    c.run("export-pkg pkga --name=pkga --version=1.0")
-    c.run("install --requires=pkga/1.0 --deployer=runtime_deploy --deployer-folder=myruntime")
-    assert os.listdir(os.path.join(c.current_folder, "myruntime")) == []
-
-def test_runtime_deploy_components():
-    c = TestClient()
-    conanfile = textwrap.dedent("""
-        import os
-        from conan import ConanFile
-        from conan.tools.files import copy
-        class Pkg(ConanFile):
-           package_type = "shared-library"
-           def package(self):
-               copy(self, "*.so", src=self.build_folder,
-                    dst=os.path.join(self.package_folder, "a"))
-               copy(self, "*.dll", src=self.build_folder,
-                    dst=os.path.join(self.package_folder, "b"))
-           def package_info(self):
-               self.cpp_info.components["a"].libdirs = ["a"]
-               self.cpp_info.components["b"].bindirs = ["b"]
-       """)
-    c.save({"pkga/conanfile.py": conanfile,
-            "pkga/lib/pkga.so": "",
-            "pkga/bin/pkga.dll": "",
-            "pkgb/conanfile.py": conanfile,
-            "pkgb/lib/pkgb.so": ""})
-    c.run("export-pkg pkga --name=pkga --version=1.0")
-    c.run("export-pkg pkgb --name=pkgb --version=1.0")
-    c.run("install --requires=pkga/1.0 --requires=pkgb/1.0 --deployer=runtime_deploy "
-          "--deployer-folder=myruntime -vvv")
-
-    expected = sorted(["pkga.so", "pkgb.so", "pkga.dll"])
-    assert sorted(os.listdir(os.path.join(c.current_folder, "myruntime"))) == expected
+class TestRuntimeDeployer:
+    def test_runtime_deploy(self):
+        c = TestClient()
+        conanfile = textwrap.dedent("""
+           from conan import ConanFile
+           from conan.tools.files import copy
+           class Pkg(ConanFile):
+               package_type = "shared-library"
+               def package(self):
+                   copy(self, "*.so", src=self.build_folder, dst=self.package_folder)
+                   copy(self, "*.dll", src=self.build_folder, dst=self.package_folder)
+           """)
+        c.save({"pkga/conanfile.py": conanfile,
+                "pkga/lib/pkga.so": "",
+                "pkga/bin/pkga.dll": "",
+                "pkgb/conanfile.py": conanfile,
+                "pkgb/lib/pkgb.so": ""})
+        c.run("export-pkg pkga --name=pkga --version=1.0")
+        c.run("export-pkg pkgb --name=pkgb --version=1.0")
+        c.run("install --requires=pkga/1.0 --requires=pkgb/1.0 --deployer=runtime_deploy "
+              "--deployer-folder=myruntime -vvv")
+
+        expected = sorted(["pkga.so", "pkgb.so", "pkga.dll"])
+        assert sorted(os.listdir(os.path.join(c.current_folder, "myruntime"))) == expected
+
+    def test_runtime_not_deploy(self):
+        # https://github.com/conan-io/conan/issues/16712
+        # If no run=False (no package-type), then no runtime is deployed
+        c = TestClient()
+        conanfile = textwrap.dedent("""
+           from conan import ConanFile
+           from conan.tools.files import copy
+           class Pkg(ConanFile):
+               def package(self):
+                   copy(self, "*.so", src=self.build_folder, dst=self.package_folder)
+                   copy(self, "*.dll", src=self.build_folder, dst=self.package_folder)
+           """)
+        c.save({"pkga/conanfile.py": conanfile,
+                "pkga/lib/pkga.so": "",
+                "pkga/bin/pkga.dll": ""})
+        c.run("export-pkg pkga --name=pkga --version=1.0")
+        c.run("install --requires=pkga/1.0 --deployer=runtime_deploy --deployer-folder=myruntime")
+        assert os.listdir(os.path.join(c.current_folder, "myruntime")) == []
+
+    def test_runtime_deploy_components(self):
+        c = TestClient()
+        conanfile = textwrap.dedent("""
+            import os
+            from conan import ConanFile
+            from conan.tools.files import copy
+            class Pkg(ConanFile):
+               package_type = "shared-library"
+               def package(self):
+                   copy(self, "*.so", src=self.build_folder,
+                        dst=os.path.join(self.package_folder, "a"))
+                   copy(self, "*.dll", src=self.build_folder,
+                        dst=os.path.join(self.package_folder, "b"))
+               def package_info(self):
+                   self.cpp_info.components["a"].libdirs = ["a"]
+                   self.cpp_info.components["b"].bindirs = ["b"]
+           """)
+        c.save({"pkga/conanfile.py": conanfile,
+                "pkga/lib/pkga.so": "",
+                "pkga/bin/pkga.dll": "",
+                "pkgb/conanfile.py": conanfile,
+                "pkgb/lib/pkgb.so": ""})
+        c.run("export-pkg pkga --name=pkga --version=1.0")
+        c.run("export-pkg pkgb --name=pkgb --version=1.0")
+        c.run("install --requires=pkga/1.0 --requires=pkgb/1.0 --deployer=runtime_deploy "
+              "--deployer-folder=myruntime -vvv")
+
+        expected = sorted(["pkga.so", "pkgb.so", "pkga.dll"])
+        assert sorted(os.listdir(os.path.join(c.current_folder, "myruntime"))) == expected
 
 
 def test_runtime_deploy_symlinks():