Test/test (#17803)

* wip

* faster tests

* wip

* wip

* fix

* fixes

* fix tests

Author: memsharded

conan/api/model/list.py

@@ -16,9 +16,6 @@ class MultiPackagesList:
     def __init__(self):
         self.lists = {}
 
-    def setdefault(self, key, default):
-        return self.lists.setdefault(key, default)
-
     def __getitem__(self, name):
         try:
             return self.lists[name]
@@ -57,11 +54,6 @@ def load(file):
         pkglist.lists = result
         return pkglist
 
-    @staticmethod
-    def from_graph(graph, graph_recipes=None, graph_binaries=None):
-        graph = {"graph": graph.serialize()}
-        return MultiPackagesList._define_graph(graph, graph_recipes, graph_binaries)
-
     @staticmethod
     def load_graph(graphfile, graph_recipes=None, graph_binaries=None):
         if not os.path.isfile(graphfile):

conan/test/utils/profiles.py

@@ -5,11 +5,7 @@
 from conans.util.files import save
 
 
-def create_profile(folder, name, settings=None, package_settings=None, env=None,
-                   package_env=None, options=None, conf=None):
-
-    package_env = package_env or {}
-
+def create_profile(folder, name, settings=None, package_settings=None, options=None):
     profile = Profile()
     profile.settings = settings or {}
 
@@ -19,18 +15,4 @@ def create_profile(folder, name, settings=None, package_settings=None, env=None,
     if options:
         profile.options = Options(options_values=options)
 
-    if conf:
-        _conf = "\n".join(conf) if isinstance(conf, list) else conf
-        profile.conf.loads(_conf)
-
-    """for package_name, envs in package_env.items():
-        for var_name, value in envs:
-            # Initialize Environment without Conanfile, what else can we do
-            profile._environments.set_default(package_name, Environment(conanfile=None))\
-                .define(var_name, value)
-
-    for var_name, value in env or {}:
-        profile._environments.set_default(None, Environment(conanfile=None)) \
-            .define(var_name, value)"""
-
     save(os.path.join(folder, name), profile.dumps())

conan/test/utils/tools.py

@@ -8,17 +8,16 @@
 import socket
 import sys
 import textwrap
-import threading
-import time
 import traceback
 import uuid
 import zipfile
 from collections import OrderedDict
 from contextlib import contextmanager
+from inspect import getframeinfo, stack
 from urllib.parse import urlsplit, urlunsplit
 
-import bottle
 import mock
+import pytest
 import requests
 from mock import Mock
 from requests.exceptions import HTTPError
@@ -35,11 +34,8 @@
 from conan.cli.cli import Cli, _CONAN_INTERNAL_CUSTOM_COMMANDS_PATH
 from conan.test.utils.env import environment_update
 from conan.internal.errors import NotFoundException
-from conan.internal.model.manifest import FileTreeManifest
 from conan.api.model import PkgReference
-from conan.internal.model.profile import Profile
 from conan.api.model import RecipeReference
-from conan.internal.model.settings import Settings
 from conan.test.assets.genconanfile import GenConanfile
 from conan.test.utils.artifactory import ArtifactoryServer
 from conan.test.utils.mocks import RedirectedInputStream
@@ -83,28 +79,6 @@
         """)
 }
 
-def inc_recipe_manifest_timestamp(cache, reference, inc_time):
-    ref = RecipeReference.loads(reference)
-    path = cache.get_latest_recipe_reference(ref).export()
-    manifest = FileTreeManifest.load(path)
-    manifest.time += inc_time
-    manifest.save(path)
-
-
-def inc_package_manifest_timestamp(cache, package_reference, inc_time):
-    path = cache.get_latest_package_reference(package_reference).package()
-    manifest = FileTreeManifest.load(path)
-    manifest.time += inc_time
-    manifest.save(path)
-
-
-def create_profile(profile=None, settings=None):
-    if profile is None:
-        profile = Profile()
-    if profile.processed_settings is None:
-        profile.processed_settings = settings or Settings()
-    return profile
-
 
 class TestingResponse(object):
     """Wraps a response from TestApp external tool
@@ -629,15 +603,15 @@ def _handle_cli_result(self, command, assert_error, error, trace=None):
                 msg = " Command succeeded (failure expected): "
             else:
                 msg = " Command failed (unexpectedly): "
-            exc_message = "\n{header}\n{cmd}\n{output_header}\n{output}\n".format(
-                header='{:=^80}'.format(msg),
-                output_header='{:=^80}'.format(" Output: "),
-                cmd=command,
-                output=str(self.stderr) + str(self.stdout) + "\n" + str(self.out)
-            )
+
+            output = str(self.stderr) + str(self.stdout) + "\n"
+            exc_message = f"\n{msg:=^80}\n{command}\n{' Output: ':=^80}\n{output}\n"
             if trace:
-                exc_message += '{:=^80}'.format(" Traceback: ") + f"\n{trace}"
-            raise Exception(exc_message)
+                exc_message += f'{" Traceback: ":=^80}\n{trace}'
+
+            caller = getframeinfo(stack()[3][0])
+            exc_message = f"{caller.filename}:{caller.lineno}" + exc_message
+            pytest.fail(exc_message, pytrace=False)
 
     def save(self, files, path=None, clean_first=False):
         """ helper metod, will store files in the current folder
@@ -853,28 +827,6 @@ def get_free_port():
     return ret
 
 
-class StoppableThreadBottle(threading.Thread):
-    """
-    Real server to test download endpoints
-    """
-
-    def __init__(self, host=None, port=None):
-        self.host = host or "127.0.0.1"
-        self.server = bottle.Bottle()
-        self.port = port or get_free_port()
-        super(StoppableThreadBottle, self).__init__(target=self.server.run,
-                                                    kwargs={"host": self.host, "port": self.port})
-        self.daemon = True
-        self._stop = threading.Event()
-
-    def stop(self):
-        self._stop.set()
-
-    def run_server(self):
-        self.start()
-        time.sleep(1)
-
-
 def zipdir(path, zipfilename):
     with zipfile.ZipFile(zipfilename, 'w', zipfile.ZIP_DEFLATED) as z:
         for root, _, files in os.walk(path):

test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py

@@ -64,9 +64,9 @@ def test_no_soname_flag(nosoname_property):
     # If `nosoname_property` is False, and we have a library without the SONAME flag,
     # then it should fail
     if nosoname_property is False:
-        with pytest.raises(Exception, match=r"libnosoname.so: cannot open shared object "
-                                            r"file: No such file or directory"):
-            client.run_command(command)
+        client.run_command(command, assert_error=True)
+        assert "libnosoname.so: cannot open shared object file: " \
+               "No such file or directory" in client.out
     else:
         client.run_command(command)
         assert "nosoname/0.1: Hello World Release!" in client.out

test/functional/tools/scm/test_git.py

@@ -596,9 +596,8 @@ def test_clone_invalid_branch_argument(self):
         c = TestClient()
         git_args = ['--branch', 'foobar']
         c.save({"conanfile.py": self.conanfile.format(url=url, commit=commit, args=str(git_args))})
-        with pytest.raises(Exception):
-            c.run("create .")
-            assert "Remote branch foobar not found" in c.out
+        c.run("create .", assert_error=True)
+        assert "Remote branch foobar not found" in c.out
 
 
 @pytest.mark.tool("git")