← Back to team overview

launchpad-reviewers team mailing list archive

Re: [Merge] ~jugmac00/lpcraft:add-support-for-conda-channels into lpcraft:main

 

Should be probably reviewed with the related MPs for launchpad and launchpad-buildd, see https://warthogs.atlassian.net/browse/LP-775

Diff comments:

> diff --git a/lpcraft/plugin/tests/test_plugins.py b/lpcraft/plugin/tests/test_plugins.py
> index e0ec098..5b28fd7 100644
> --- a/lpcraft/plugin/tests/test_plugins.py
> +++ b/lpcraft/plugin/tests/test_plugins.py
> @@ -545,88 +545,102 @@ class TestPlugins(CommandBaseTestCase):
>              "source activate $CONDA_ENV; conda env export"
>          )
>  
> -        self.run_command("run")
> +        self.run_command(
> +            "run",
> +            "--plugin-setting",
> +            "miniconda_conda_channel=https://user:pass@xxxxxxxxxxxxxxxxxxxxx/artifactory/soss-conda-stable-local/";,  # noqa: E501
> +        )
>  
>          self.assertEqual(
> -            [

I split this huge single assertion into several one to make it easier to compare the actual vs the expected result (after once more spending way to much time on finding a single whitespace difference).

> -                call(
> -                    ["apt", "update"],
> -                    cwd=PosixPath("/root/lpcraft/project"),
> -                    env={"CONDA_ENV": "lpci"},
> -                    stdout=ANY,
> -                    stderr=ANY,
> -                ),
> -                call(
> -                    [
> -                        "apt",
> -                        "install",
> -                        "-y",
> -                        "git",
> -                        "python3-dev",
> -                        "python3-pip",
> -                        "python3-venv",
> -                        "wget",
> -                        "automake",
> -                        "build-essential",
> -                        "cmake",
> -                        "gcc",
> -                        "g++",
> -                        "libc++-dev",
> -                        "libc6-dev",
> -                        "libffi-dev",
> -                        "libjpeg-dev",
> -                        "libpng-dev",
> -                        "libreadline-dev",
> -                        "libsqlite3-dev",
> -                        "libtool",
> -                        "zlib1g-dev",
> -                    ],
> -                    cwd=PosixPath("/root/lpcraft/project"),
> -                    env={"CONDA_ENV": "lpci"},
> -                    stdout=ANY,
> -                    stderr=ANY,
> -                ),
> -                call(
> -                    [
> -                        "bash",
> -                        "--noprofile",
> -                        "--norc",
> -                        "-ec",
> -                        pre_run_command,
> -                    ],
> -                    cwd=PosixPath("/root/lpcraft/project"),
> -                    env={"CONDA_ENV": "lpci"},
> -                    stdout=ANY,
> -                    stderr=ANY,
> -                ),
> -                call(
> -                    [
> -                        "bash",
> -                        "--noprofile",
> -                        "--norc",
> -                        "-ec",
> -                        run_command,
> -                    ],
> -                    cwd=PosixPath("/root/lpcraft/project"),
> -                    env={"CONDA_ENV": "lpci"},
> -                    stdout=ANY,
> -                    stderr=ANY,
> -                ),
> -                call(
> -                    [
> -                        "bash",
> -                        "--noprofile",
> -                        "--norc",
> -                        "-ec",
> -                        post_run_command,
> -                    ],
> -                    cwd=PosixPath("/root/lpcraft/project"),
> -                    env={"CONDA_ENV": "lpci"},
> -                    stdout=ANY,
> -                    stderr=ANY,
> -                ),
> -            ],
> -            execute_run.call_args_list,
> +            call(
> +                ["apt", "update"],
> +                cwd=PosixPath("/root/lpcraft/project"),
> +                env={"CONDA_ENV": "lpci"},
> +                stdout=ANY,
> +                stderr=ANY,
> +            ),
> +            execute_run.call_args_list[0],
> +        )
> +        self.assertEqual(
> +            call(
> +                [
> +                    "apt",
> +                    "install",
> +                    "-y",
> +                    "git",
> +                    "python3-dev",
> +                    "python3-pip",
> +                    "python3-venv",
> +                    "wget",
> +                    "automake",
> +                    "build-essential",
> +                    "cmake",
> +                    "gcc",
> +                    "g++",
> +                    "libc++-dev",
> +                    "libc6-dev",
> +                    "libffi-dev",
> +                    "libjpeg-dev",
> +                    "libpng-dev",
> +                    "libreadline-dev",
> +                    "libsqlite3-dev",
> +                    "libtool",
> +                    "zlib1g-dev",
> +                ],
> +                cwd=PosixPath("/root/lpcraft/project"),
> +                env={"CONDA_ENV": "lpci"},
> +                stdout=ANY,
> +                stderr=ANY,
> +            ),
> +            execute_run.call_args_list[1],
> +        )
> +        self.assertEqual(
> +            call(
> +                [
> +                    "bash",
> +                    "--noprofile",
> +                    "--norc",
> +                    "-ec",
> +                    pre_run_command,
> +                ],
> +                cwd=PosixPath("/root/lpcraft/project"),
> +                env={"CONDA_ENV": "lpci"},
> +                stdout=ANY,
> +                stderr=ANY,
> +            ),
> +            execute_run.call_args_list[2],
> +        )
> +        self.assertEqual(
> +            call(
> +                [
> +                    "bash",
> +                    "--noprofile",
> +                    "--norc",
> +                    "-ec",
> +                    run_command,
> +                ],
> +                cwd=PosixPath("/root/lpcraft/project"),
> +                env={"CONDA_ENV": "lpci"},
> +                stdout=ANY,
> +                stderr=ANY,
> +            ),
> +            execute_run.call_args_list[3],
> +        )
> +        self.assertEqual(
> +            call(
> +                [
> +                    "bash",
> +                    "--noprofile",
> +                    "--norc",
> +                    "-ec",
> +                    post_run_command,
> +                ],
> +                cwd=PosixPath("/root/lpcraft/project"),
> +                env={"CONDA_ENV": "lpci"},
> +                stdout=ANY,
> +                stderr=ANY,
> +            ),
> +            execute_run.call_args_list[4],
>          )
>  
>      def test_conda_build_plugin_finds_recipe(self):


-- 
https://code.launchpad.net/~jugmac00/lpcraft/+git/lpcraft/+merge/424380
Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/lpcraft:add-support-for-conda-channels into lpcraft:main.



References