From patchwork Wed Feb 5 07:15:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56676 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05F65C0219A for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.110]) by mx.groups.io with SMTP id smtpd.web11.6855.1738739758488645702 for ; Tue, 04 Feb 2025 23:16:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=SjcTvKfH; spf=pass (domain: weidmueller.com, ip: 40.107.20.110, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LuJ6oW+dT8NwVfP63gy5ttHaUBSpGQ/G7RpOYw6bzcnv7iivon29znM0+YVrFq8iiORH37h5Gue2Ye2rUBiKiOYWM6gSUh9FT7DoeGpdXC34nuCcuWX+N/UBT7K+YQgXA96rkgA75o4J9TMKgGclCnm8XClg/EaT9568lo1TBeJDosD6jlUHIpvsKNuL/GM+cs6pQ/Yzq/M99NwiIdaT1b4ThYzauDvD/nizfklN/RDs7+xSR5oLcTC3EQzITyl1mAVkE7UGy6GeWt49dQEr0XsUC0MeQEsbtPDglENfDf9qkbflNH01oOSdOOw0U7n9W+tsoaTYwrjT1DfuqHXYeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YRoROFcW22BiY5Z5y3K11ndyq/j0i9/mGo/xWVCRMpE=; b=Lub5ubqylFqXULPp6ogDTsrUHTUEfZhX9Lc7Az3MZrLHAJBYtJiX0Yhyohlf6/3PckpGPILs6aH9mt9PegCBcd/Cjskm9Wmeog6+aiMh8jkkXeKbi7K3dTvZenRBBuWlOfbhvZZUGVii776t3Pyy32Q253LH7mJFGvcU/tZtYEsd7YShDXIYoJDKoeN0NmBsFD3YvzC6n3aOOaegwfECIOaiaCEKfQfpMf9p0XaewOian4vqSTr5Y2iD0XyAQKiuaqxnPdkKXQCbz6MrcdBxQDaFk/hDli3rOZqJ1/PSIG9907TCQynI0TluPFJRyjRejap7FubOq2ptuww09NgqCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YRoROFcW22BiY5Z5y3K11ndyq/j0i9/mGo/xWVCRMpE=; b=SjcTvKfHg3iOzzqs9X6sIQkeRsqqpATfWobtsPrKGuyKNyt8MiHojYDyJ5jK8NmZddhN8Zm+kb8wZqO2J1uhGw+zLMD6LVSeWJduJC+ZmglsOpso2FnXDt98aV4z570jdOobCYpd5CsDaV2Mur0fVJcVq6xXb7VLUy+zjZrKV0tar+GMHiYTX37ScGrSjSfynSqobVyvPebbRk/RVBYuEPeG4j/MBWYwki5daCKBfzlpAmqL0qVW/DBj6SUr+IjGa7l5xhbArO1EKWdFWMOUXyScBugOIwJaRsB0lZXYi3QB8Vt/7DK7tVbChkvDEaLBWHlAozSCrKadDupD9lmFPg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:54 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Wed, 5 Feb 2025 07:15:54 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 10/15] tests: fetch: unify style of replaceuris in MirrorUriTest Date: Wed, 5 Feb 2025 08:15:33 +0100 Message-ID: <20250205071538.2681-10-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: e5630852-8d73-4016-936d-08dd45b4ed9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|13003099007|38350700014; X-Microsoft-Antispam-Message-Info: Y6eG8dAmBLsshbu8cJ8L57U1JTBTueH82xGE+Dck7fmIyNUkDVPmcIJzwEGq85mJlzWTYRcDlm7cg9mVxHlrAwoJ3pzMxVrcYr4wgropfv6Sn1gZGAiriKoGZahAeR4vMKyWZ3e0RVx36eyKhEV4e+durxSS+rkQmIixTPV714tp99PAZKYwEYpwiYNaqE7Z6U20JlrrwFYwCA14kSX5mp3FLRoYD6/KROFwA2BXKGY9urCy+/f1K+XSvneDFh4X2TpZF/Psug0+qOzcBfq3yw0W/SQD5Uz+7FDwASXaa5R7rzQfqVW6ldWqNxc5jFLD0uh8Ty6nrA4mW8/l/xU7dCNqB2bDcusUSW4jUxMqNddI3F4WJO++ppyozxBcWyiYzOFEb5n8m/lRY7WalY6BEJM6AA8NrAI57M2olGAF+16jLjtt91fNEwq0UUOmaFoZ/O+laByj5qgokjQ3qhy5xqK/iCGTgYIiYqaKAPsgZB3Y9s3fxbouP+ME6A1BySoqmkzuVQ8jQ1VuCXTp9netOFp4kW7kjML34zsZfQVAxRQXYaRy85sG212f4TbZLuKHI6BqJEsrnSfZCv5GBZ2fZXaRapOwHalOMTuzfZtA3Qh2ullaPX1wcMt+mtd3sWum78QMi4OrQr2hSIEqHppSvv3Wks+kzvESTyhAGqGvfw9XcR2J9TfCW5X2ydQGV61aXk49iZBjcVk9K4ys0xqU9QmVAeNFdA6bx9G4sBJCDl9NL4e4qyLcWcR0LV5Ji4X7IMLWSaqMA7Tc1mog+tBwscsiVkLGodH1LTRGCqSTZqAODHwT4BNxikVgozx17/cVCDMwp6Fc//3h3xYSTx2GNuMMPQwMUnKPnH8sjPXJ+/bKywOuRC0rgsKVsYLYOMwdBxDauH2cGau1Hp8+2bFz2ciwL9pMRyJkdiYJUgiTU4tRWLp5vHtCRLSanN1XGO2HaOXx20PqvuGQR4pKnzfWEaDkA5reRXTj9qUMVtgrMlWZ8qnLjgShaCS/M5peGbAdG/2Pub2kofxzLGJGSVQR+CYrKy0BVojmLIFb1APBqqLJxZ0/N/M354ezawHmVv99xIS3XQ+sG7XrJknam2zlccxU9iooY0bXWfLwJS3GKVk6MxWGo7REnmm8KaJbs+LOXouBUx2OF6ucZk47eOj1NvlQhfd+21nciMkSjKZ73Y1YuAp8yYmtlD1Py06rUMpKK4V4/Mq1aBYSqyV2VTdconskq8XP3RF3uivZn4olaSk199Lc3dP1CAi7JQwe+BXtMvP44rz0bj8pr+bVZG3vHkKT4dLRyAlB8bhPUORsMSbgd0UlYZJh4KHtclaWySY6pWRF2xLwXl4MOZov+2JDunGJ1PNq+g4bzcika/l5NrgQIJrgMNXCKsBvOH1PJ25k4dqqaDxuQs2ec2gvozZKdg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(13003099007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J3OH/207XSnQTI2hFV8vXlXmgI/tHo8Y0HkNPeGLK9AuUgJe2xMJg3mIi+k5v1Fk18YFHBdlhPnYbhzA66KUaFkTtO26PrX/VObyul3sWwE20oSdKVmUy1or02WbnvKgmTlbi88TmiCL2AFUSWR50Rbs33PETlgFsQP3IHBFTt6BKxJ74kkNPzj+OgeJxfwzyEtMbS1S3XFgxTydJP/xMoP46BeirDExPFkqX8/r6RU5zxRtWdOrwcCifqbFxC2KqfVaZpknIJA/5ZzqHVbVDDzikhddls/XRZaL1iUnzcZre2cckC5POywIO5ufpO+NtByHObNgVWLaVIC88vaspGo+wJ5PuVBtd3E6XjWCDVNhJ0WJkYxuQ3G+aVY+cseIzMEOR3t9+x93hAeJdVD9wezG1mE027vw24pZ5EEii4SFwrR1mghNwJSM4A2WGbDBkDW/Evsp3RgSkT3Lul1OsvyFPxEgvEYVIuU3DVylqG6ivFO8LYIsW0mglyiLRYmnF8tg2zJ4QKN+ihQtwxxCgJ3jXg+jfhBY5VVFRz7cn/MhA6icyXkLB+UQnLbIpMduhjfFm+P9fgT7uK/Bsyu9QoU2EDFdemezdprBGXthScTbci7XAFG39ykMHeIoMAb4covNDCpKgfr3IyYbPdIo/C+W7n04cQaxQaw+fH2RzQhH5FiFZY+Xi/zbacxAzTUguXVljFnTxpXOPtdc1YjSw2YmSeKoGGZUDlHq6R4Nt270guqy/N9PEP2k2lZ+sZFrr3nTZJJwsiagpHDt7JTZI6BvFIGJkwWPbrO05xQzB8JkB+JX3pngIW3zUkRfkN7nhfJlFt6pHnEc2/Zh7sLT02bYZwqDItLwOPfleUWeT0pDL/0s+FzEYjyIpjwxLZEZv+9O4zM7I6AdgUwXMErx2o49rGz/DDsmIjGidEW3MJaQ5ATQhwTCZ9ecQyqypPDOj+ClIsMo15uxdm2GwN71B8q5Lt4mYOCP2HImkXN+bIjvuYxtOgRuvsc9VYSD5y4A7QqWzrj5BpXZNm578Ln2089PKYnwIdVkgFSudZGBH+7zRJ4vB0Toa1hSzQSmmbrtF+yedNa6bQfZD6TRx+hxi/sOMKCdu6cPbG97x/H/ZEPyBbogKghRxhKuuhq2IpkDu56j9RufJp0B0j/EgQO05vyX57j8X33CzL7NHZndf+vrUOmufvV8ibCEIn7XRiboQ+vtrJdCDoKUvEshmfvAGVG0fMO4par2gozzvp80WwJKpickrZhB8Ym1/G8Q2bRASM2C1pjAcv/oraixYCbi+uSQyhyXCZCn1uVkhBt5dQvLmI67G5G/bq1cLE/SIFaQtZUKzFDutFlOZDX+4Xm0TEwJ6JKIBmt3VC/3tG4UaFMRflTGiPKxHDW3gHOM2FRGok4bno0RUMRQqzu8bMnu3i9KWwRyTYgUbhucq6t84etwusYguQenEYQPPit5q7gpG6FOJ6q3PL4CbwFNLsa0cSP9Y03YMVqyM3N26e2krrv552mezgohcCaOU4yVZuZenArNKgiHAtgT+Qkadl0DVV4jv05FC3r3PJWMMlYHSHzQ7nysgl8kHW8HK9GGrznEA7hPzTEyzZOS8lY77hRJGA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5630852-8d73-4016-936d-08dd45b4ed9c X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:54.0675 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ebTNR8qFBdzU1pLu1gdmTE9za8YlOvIWM4TKH3W4hdoNLcN6+/ZC5BY3rQwgyYJnQyeAC/EIthL8Cq/oQrHedA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17145 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index d64717011..dbb787a7d 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -497,15 +497,18 @@ class MirrorUriTest(FetcherTest): : "git://user2@git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http", ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=git;branch=master", "git://someserver.org/bitbake", "git://someotherserver.org/bitbake;protocol=https") : "git://someotherserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=https;branch=master", - ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", + ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") + : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", ("https://somewhere.org/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/PATH") : "file:///mirror/example/1.0.0/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/some-example-1.0.0.tgz") : "file:///mirror/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", #Renaming files doesn't work - #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" - #("file://sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", + #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") + # : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" + #("file://sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") + # : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", } mirrorvar = "http://.*/.* file:///somepath/downloads/ " \