0s autopkgtest [04:15:25]: starting date and time: 2025-02-19 04:15:25+0000 0s autopkgtest [04:15:25]: git checkout: 325255d2 Merge branch 'pin-any-arch' into 'ubuntu/production' 0s autopkgtest [04:15:25]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.tu63q6mz/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed=src:git --apt-upgrade git-revise --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=git/1:2.48.1-0ubuntu1 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@bos03-arm64-27.secgroup --name adt-plucky-arm64-git-revise-20250219-041525-juju-7f2275-prod-proposed-migration-environment-2-463fb041-3d2b-4ce9-8fc1-a7943d3ede31 --image adt/ubuntu-plucky-arm64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-proposed-migration -e TERM=linux -e ''"'"'http_proxy=http://squid.internal:3128'"'"'' -e ''"'"'https_proxy=http://squid.internal:3128'"'"'' -e ''"'"'no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com'"'"'' --mirror=http://ftpmaster.internal/ubuntu/ 136s autopkgtest [04:17:41]: testbed dpkg architecture: arm64 136s autopkgtest [04:17:41]: testbed apt version: 2.9.29 137s autopkgtest [04:17:42]: @@@@@@@@@@@@@@@@@@@@ test bed setup 137s autopkgtest [04:17:42]: testbed release detected to be: None 138s autopkgtest [04:17:43]: updating testbed package index (apt update) 138s Get:1 http://ftpmaster.internal/ubuntu plucky-proposed InRelease [110 kB] 139s Hit:2 http://ftpmaster.internal/ubuntu plucky InRelease 139s Hit:3 http://ftpmaster.internal/ubuntu plucky-updates InRelease 139s Hit:4 http://ftpmaster.internal/ubuntu plucky-security InRelease 139s Get:5 http://ftpmaster.internal/ubuntu plucky-proposed/main Sources [79.1 kB] 139s Get:6 http://ftpmaster.internal/ubuntu plucky-proposed/multiverse Sources [14.6 kB] 139s Get:7 http://ftpmaster.internal/ubuntu plucky-proposed/restricted Sources [3120 B] 139s Get:8 http://ftpmaster.internal/ubuntu plucky-proposed/universe Sources [788 kB] 139s Get:9 http://ftpmaster.internal/ubuntu plucky-proposed/main arm64 Packages [97.6 kB] 139s Get:10 http://ftpmaster.internal/ubuntu plucky-proposed/restricted arm64 Packages [7960 B] 139s Get:11 http://ftpmaster.internal/ubuntu plucky-proposed/universe arm64 Packages [698 kB] 139s Get:12 http://ftpmaster.internal/ubuntu plucky-proposed/multiverse arm64 Packages [12.1 kB] 139s Fetched 1811 kB in 1s (1885 kB/s) 140s Reading package lists... 141s Reading package lists... 141s Building dependency tree... 141s Reading state information... 142s Calculating upgrade... 142s The following packages will be upgraded: 142s dhcpcd-base 142s 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 142s Need to get 216 kB of archives. 142s After this operation, 0 B of additional disk space will be used. 142s Get:1 http://ftpmaster.internal/ubuntu plucky/main arm64 dhcpcd-base arm64 1:10.1.0-7 [216 kB] 143s Fetched 216 kB in 0s (488 kB/s) 144s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 116620 files and directories currently installed.) 144s Preparing to unpack .../dhcpcd-base_1%3a10.1.0-7_arm64.deb ... 144s Unpacking dhcpcd-base (1:10.1.0-7) over (1:10.1.0-6) ... 144s Setting up dhcpcd-base (1:10.1.0-7) ... 144s Processing triggers for man-db (2.13.0-1) ... 145s Reading package lists... 145s Building dependency tree... 145s Reading state information... 146s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 146s autopkgtest [04:17:51]: upgrading testbed (apt dist-upgrade and autopurge) 146s Reading package lists... 146s Building dependency tree... 146s Reading state information... 147s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 147s Starting 2 pkgProblemResolver with broken count: 0 147s Done 148s Entering ResolveByKeep 148s 148s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 149s Reading package lists... 149s Building dependency tree... 149s Reading state information... 149s Starting pkgProblemResolver with broken count: 0 149s Starting 2 pkgProblemResolver with broken count: 0 149s Done 150s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 153s autopkgtest [04:17:58]: testbed running kernel: Linux 6.12.0-15-generic #15-Ubuntu SMP PREEMPT_DYNAMIC Tue Feb 4 15:49:33 UTC 2025 153s autopkgtest [04:17:58]: @@@@@@@@@@@@@@@@@@@@ apt-source git-revise 155s Get:1 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (dsc) [1879 B] 155s Get:2 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (tar) [35.6 kB] 155s Get:3 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (diff) [3456 B] 155s gpgv: Signature made Wed Mar 30 16:15:29 2022 UTC 155s gpgv: using RSA key 406220C8B8552802378CCE411F5C7A8B45564314 155s gpgv: issuer "bage@debian.org" 155s gpgv: Can't check signature: No public key 155s dpkg-source: warning: cannot verify inline signature for ./git-revise_0.7.0-1.dsc: no acceptable signature found 155s autopkgtest [04:18:00]: testing package git-revise version 0.7.0-1 155s autopkgtest [04:18:00]: build not needed 156s autopkgtest [04:18:01]: test command1: preparing testbed 156s Reading package lists... 156s Building dependency tree... 156s Reading state information... 157s Starting pkgProblemResolver with broken count: 0 157s Starting 2 pkgProblemResolver with broken count: 0 157s Done 158s The following NEW packages will be installed: 158s autoconf automake autopoint autotools-dev build-essential cpp cpp-14 158s cpp-14-aarch64-linux-gnu cpp-aarch64-linux-gnu debhelper debugedit 158s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-14 158s g++-14-aarch64-linux-gnu g++-aarch64-linux-gnu gcc gcc-14 158s gcc-14-aarch64-linux-gnu gcc-aarch64-linux-gnu gettext git git-man 158s git-revise intltool-debian libarchive-zip-perl libasan8 libcc1-0 158s libdebhelper-perl liberror-perl libexpat1-dev 158s libfile-stripnondeterminism-perl libgcc-14-dev libgomp1 libhwasan0 libisl23 158s libitm1 liblsan0 libmpc3 libpython3-dev libpython3.13-dev libstdc++-14-dev 158s libtool libtsan2 libubsan1 m4 mypy po-debconf pypy3 pypy3-dev pypy3-lib 158s python3-all python3-iniconfig python3-mypy python3-mypy-extensions 158s python3-packaging python3-pluggy python3-psutil python3-pytest python3.12 158s python3.12-minimal zlib1g-dev 158s 0 upgraded, 65 newly installed, 0 to remove and 0 not upgraded. 158s Need to get 109 MB of archives. 158s After this operation, 462 MB of additional disk space will be used. 158s Get:1 http://ftpmaster.internal/ubuntu plucky/main arm64 python3.12-minimal arm64 3.12.9-1 [2236 kB] 159s Get:2 http://ftpmaster.internal/ubuntu plucky/universe arm64 pypy3-lib arm64 7.3.18+dfsg-2 [2872 kB] 159s Get:3 http://ftpmaster.internal/ubuntu plucky/universe arm64 pypy3 arm64 7.3.18+dfsg-2 [11.5 MB] 160s Get:4 http://ftpmaster.internal/ubuntu plucky/main arm64 python3.12 arm64 3.12.9-1 [671 kB] 160s Get:5 http://ftpmaster.internal/ubuntu plucky/main arm64 m4 arm64 1.4.19-5 [244 kB] 160s Get:6 http://ftpmaster.internal/ubuntu plucky/main arm64 autoconf all 2.72-3 [382 kB] 160s Get:7 http://ftpmaster.internal/ubuntu plucky/main arm64 autotools-dev all 20220109.1 [44.9 kB] 160s Get:8 http://ftpmaster.internal/ubuntu plucky/main arm64 automake all 1:1.17-3 [572 kB] 160s Get:9 http://ftpmaster.internal/ubuntu plucky/main arm64 autopoint all 0.23.1-1 [619 kB] 160s Get:10 http://ftpmaster.internal/ubuntu plucky/main arm64 libisl23 arm64 0.27-1 [676 kB] 160s Get:11 http://ftpmaster.internal/ubuntu plucky/main arm64 libmpc3 arm64 1.3.1-1build2 [56.8 kB] 160s Get:12 http://ftpmaster.internal/ubuntu plucky/main arm64 cpp-14-aarch64-linux-gnu arm64 14.2.0-17ubuntu1 [10.6 MB] 160s Get:13 http://ftpmaster.internal/ubuntu plucky/main arm64 cpp-14 arm64 14.2.0-17ubuntu1 [1032 B] 160s Get:14 http://ftpmaster.internal/ubuntu plucky/main arm64 cpp-aarch64-linux-gnu arm64 4:14.2.0-1ubuntu1 [5558 B] 160s Get:15 http://ftpmaster.internal/ubuntu plucky/main arm64 cpp arm64 4:14.2.0-1ubuntu1 [22.4 kB] 160s Get:16 http://ftpmaster.internal/ubuntu plucky/main arm64 libcc1-0 arm64 15-20250213-1ubuntu1 [44.2 kB] 161s Get:17 http://ftpmaster.internal/ubuntu plucky/main arm64 libgomp1 arm64 15-20250213-1ubuntu1 [146 kB] 161s Get:18 http://ftpmaster.internal/ubuntu plucky/main arm64 libitm1 arm64 15-20250213-1ubuntu1 [28.0 kB] 161s Get:19 http://ftpmaster.internal/ubuntu plucky/main arm64 libasan8 arm64 15-20250213-1ubuntu1 [2928 kB] 161s Get:20 http://ftpmaster.internal/ubuntu plucky/main arm64 liblsan0 arm64 15-20250213-1ubuntu1 [1319 kB] 161s Get:21 http://ftpmaster.internal/ubuntu plucky/main arm64 libtsan2 arm64 15-20250213-1ubuntu1 [2695 kB] 161s Get:22 http://ftpmaster.internal/ubuntu plucky/main arm64 libubsan1 arm64 15-20250213-1ubuntu1 [1178 kB] 161s Get:23 http://ftpmaster.internal/ubuntu plucky/main arm64 libhwasan0 arm64 15-20250213-1ubuntu1 [1642 kB] 161s Get:24 http://ftpmaster.internal/ubuntu plucky/main arm64 libgcc-14-dev arm64 14.2.0-17ubuntu1 [2593 kB] 161s Get:25 http://ftpmaster.internal/ubuntu plucky/main arm64 gcc-14-aarch64-linux-gnu arm64 14.2.0-17ubuntu1 [20.9 MB] 162s Get:26 http://ftpmaster.internal/ubuntu plucky/main arm64 gcc-14 arm64 14.2.0-17ubuntu1 [526 kB] 162s Get:27 http://ftpmaster.internal/ubuntu plucky/main arm64 gcc-aarch64-linux-gnu arm64 4:14.2.0-1ubuntu1 [1200 B] 162s Get:28 http://ftpmaster.internal/ubuntu plucky/main arm64 gcc arm64 4:14.2.0-1ubuntu1 [4998 B] 162s Get:29 http://ftpmaster.internal/ubuntu plucky/main arm64 libstdc++-14-dev arm64 14.2.0-17ubuntu1 [2499 kB] 162s Get:30 http://ftpmaster.internal/ubuntu plucky/main arm64 g++-14-aarch64-linux-gnu arm64 14.2.0-17ubuntu1 [12.1 MB] 162s Get:31 http://ftpmaster.internal/ubuntu plucky/main arm64 g++-14 arm64 14.2.0-17ubuntu1 [21.8 kB] 162s Get:32 http://ftpmaster.internal/ubuntu plucky/main arm64 g++-aarch64-linux-gnu arm64 4:14.2.0-1ubuntu1 [956 B] 162s Get:33 http://ftpmaster.internal/ubuntu plucky/main arm64 g++ arm64 4:14.2.0-1ubuntu1 [1080 B] 162s Get:34 http://ftpmaster.internal/ubuntu plucky/main arm64 build-essential arm64 12.10ubuntu1 [4932 B] 162s Get:35 http://ftpmaster.internal/ubuntu plucky/main arm64 libdebhelper-perl all 13.24.1ubuntu2 [95.4 kB] 162s Get:36 http://ftpmaster.internal/ubuntu plucky/main arm64 libtool all 2.5.4-3build1 [168 kB] 162s Get:37 http://ftpmaster.internal/ubuntu plucky/main arm64 dh-autoreconf all 20 [16.1 kB] 162s Get:38 http://ftpmaster.internal/ubuntu plucky/main arm64 libarchive-zip-perl all 1.68-1 [90.2 kB] 162s Get:39 http://ftpmaster.internal/ubuntu plucky/main arm64 libfile-stripnondeterminism-perl all 1.14.1-2 [20.3 kB] 162s Get:40 http://ftpmaster.internal/ubuntu plucky/main arm64 dh-strip-nondeterminism all 1.14.1-2 [5064 B] 162s Get:41 http://ftpmaster.internal/ubuntu plucky/main arm64 debugedit arm64 1:5.1-2 [46.1 kB] 162s Get:42 http://ftpmaster.internal/ubuntu plucky/main arm64 dwz arm64 0.15-1build6 [113 kB] 162s Get:43 http://ftpmaster.internal/ubuntu plucky/main arm64 gettext arm64 0.23.1-1 [998 kB] 162s Get:44 http://ftpmaster.internal/ubuntu plucky/main arm64 intltool-debian all 0.35.0+20060710.6 [23.2 kB] 162s Get:45 http://ftpmaster.internal/ubuntu plucky/main arm64 po-debconf all 1.0.21+nmu1 [233 kB] 162s Get:46 http://ftpmaster.internal/ubuntu plucky/main arm64 debhelper all 13.24.1ubuntu2 [895 kB] 162s Get:47 http://ftpmaster.internal/ubuntu plucky/universe arm64 dh-python all 6.20250108 [117 kB] 162s Get:48 http://ftpmaster.internal/ubuntu plucky/main arm64 liberror-perl all 0.17029-2 [25.6 kB] 162s Get:49 http://ftpmaster.internal/ubuntu plucky-proposed/main arm64 git-man all 1:2.48.1-0ubuntu1 [1148 kB] 162s Get:50 http://ftpmaster.internal/ubuntu plucky-proposed/main arm64 git arm64 1:2.48.1-0ubuntu1 [4219 kB] 162s Get:51 http://ftpmaster.internal/ubuntu plucky/universe arm64 git-revise all 0.7.0-1 [31.7 kB] 162s Get:52 http://ftpmaster.internal/ubuntu plucky/main arm64 libexpat1-dev arm64 2.6.4-1 [129 kB] 162s Get:53 http://ftpmaster.internal/ubuntu plucky/main arm64 zlib1g-dev arm64 1:1.3.dfsg+really1.3.1-1ubuntu1 [894 kB] 162s Get:54 http://ftpmaster.internal/ubuntu plucky/main arm64 libpython3.13-dev arm64 3.13.2-1 [5399 kB] 162s Get:55 http://ftpmaster.internal/ubuntu plucky/main arm64 libpython3-dev arm64 3.13.1-1~exp2 [10.5 kB] 162s Get:56 http://ftpmaster.internal/ubuntu plucky/universe arm64 python3-mypy-extensions all 1.0.0-1 [6148 B] 162s Get:57 http://ftpmaster.internal/ubuntu plucky/main arm64 python3-psutil arm64 5.9.8-2build3 [196 kB] 162s Get:58 http://ftpmaster.internal/ubuntu plucky/universe arm64 python3-mypy arm64 1.15.0-2 [14.8 MB] 163s Get:59 http://ftpmaster.internal/ubuntu plucky/universe arm64 mypy all 1.15.0-2 [25.4 kB] 163s Get:60 http://ftpmaster.internal/ubuntu plucky/universe arm64 pypy3-dev all 7.3.18+dfsg-2 [79.9 kB] 163s Get:61 http://ftpmaster.internal/ubuntu plucky/main arm64 python3-all arm64 3.13.1-1~exp2 [894 B] 163s Get:62 http://ftpmaster.internal/ubuntu plucky/universe arm64 python3-iniconfig all 1.1.1-2 [6024 B] 163s Get:63 http://ftpmaster.internal/ubuntu plucky/main arm64 python3-packaging all 24.2-1 [51.5 kB] 163s Get:64 http://ftpmaster.internal/ubuntu plucky/universe arm64 python3-pluggy all 1.5.0-1 [21.0 kB] 163s Get:65 http://ftpmaster.internal/ubuntu plucky/universe arm64 python3-pytest all 8.3.4-1 [252 kB] 163s Fetched 109 MB in 5s (20.5 MB/s) 163s Selecting previously unselected package python3.12-minimal. 163s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 116620 files and directories currently installed.) 164s Preparing to unpack .../python3.12-minimal_3.12.9-1_arm64.deb ... 164s Unpacking python3.12-minimal (3.12.9-1) ... 164s Selecting previously unselected package pypy3-lib:arm64. 164s Preparing to unpack .../pypy3-lib_7.3.18+dfsg-2_arm64.deb ... 164s Unpacking pypy3-lib:arm64 (7.3.18+dfsg-2) ... 164s Setting up pypy3-lib:arm64 (7.3.18+dfsg-2) ... 164s Selecting previously unselected package pypy3. 164s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 117880 files and directories currently installed.) 164s Preparing to unpack .../00-pypy3_7.3.18+dfsg-2_arm64.deb ... 164s Unpacking pypy3 (7.3.18+dfsg-2) ... 164s Selecting previously unselected package python3.12. 164s Preparing to unpack .../01-python3.12_3.12.9-1_arm64.deb ... 164s Unpacking python3.12 (3.12.9-1) ... 164s Selecting previously unselected package m4. 164s Preparing to unpack .../02-m4_1.4.19-5_arm64.deb ... 164s Unpacking m4 (1.4.19-5) ... 164s Selecting previously unselected package autoconf. 164s Preparing to unpack .../03-autoconf_2.72-3_all.deb ... 164s Unpacking autoconf (2.72-3) ... 164s Selecting previously unselected package autotools-dev. 164s Preparing to unpack .../04-autotools-dev_20220109.1_all.deb ... 164s Unpacking autotools-dev (20220109.1) ... 164s Selecting previously unselected package automake. 164s Preparing to unpack .../05-automake_1%3a1.17-3_all.deb ... 164s Unpacking automake (1:1.17-3) ... 164s Selecting previously unselected package autopoint. 165s Preparing to unpack .../06-autopoint_0.23.1-1_all.deb ... 165s Unpacking autopoint (0.23.1-1) ... 165s Selecting previously unselected package libisl23:arm64. 165s Preparing to unpack .../07-libisl23_0.27-1_arm64.deb ... 165s Unpacking libisl23:arm64 (0.27-1) ... 165s Selecting previously unselected package libmpc3:arm64. 165s Preparing to unpack .../08-libmpc3_1.3.1-1build2_arm64.deb ... 165s Unpacking libmpc3:arm64 (1.3.1-1build2) ... 165s Selecting previously unselected package cpp-14-aarch64-linux-gnu. 165s Preparing to unpack .../09-cpp-14-aarch64-linux-gnu_14.2.0-17ubuntu1_arm64.deb ... 165s Unpacking cpp-14-aarch64-linux-gnu (14.2.0-17ubuntu1) ... 165s Selecting previously unselected package cpp-14. 165s Preparing to unpack .../10-cpp-14_14.2.0-17ubuntu1_arm64.deb ... 165s Unpacking cpp-14 (14.2.0-17ubuntu1) ... 165s Selecting previously unselected package cpp-aarch64-linux-gnu. 165s Preparing to unpack .../11-cpp-aarch64-linux-gnu_4%3a14.2.0-1ubuntu1_arm64.deb ... 165s Unpacking cpp-aarch64-linux-gnu (4:14.2.0-1ubuntu1) ... 165s Selecting previously unselected package cpp. 165s Preparing to unpack .../12-cpp_4%3a14.2.0-1ubuntu1_arm64.deb ... 165s Unpacking cpp (4:14.2.0-1ubuntu1) ... 165s Selecting previously unselected package libcc1-0:arm64. 165s Preparing to unpack .../13-libcc1-0_15-20250213-1ubuntu1_arm64.deb ... 165s Unpacking libcc1-0:arm64 (15-20250213-1ubuntu1) ... 165s Selecting previously unselected package libgomp1:arm64. 165s Preparing to unpack .../14-libgomp1_15-20250213-1ubuntu1_arm64.deb ... 165s Unpacking libgomp1:arm64 (15-20250213-1ubuntu1) ... 165s Selecting previously unselected package libitm1:arm64. 165s Preparing to unpack .../15-libitm1_15-20250213-1ubuntu1_arm64.deb ... 165s Unpacking libitm1:arm64 (15-20250213-1ubuntu1) ... 165s Selecting previously unselected package libasan8:arm64. 165s Preparing to unpack .../16-libasan8_15-20250213-1ubuntu1_arm64.deb ... 165s Unpacking libasan8:arm64 (15-20250213-1ubuntu1) ... 165s Selecting previously unselected package liblsan0:arm64. 165s Preparing to unpack .../17-liblsan0_15-20250213-1ubuntu1_arm64.deb ... 165s Unpacking liblsan0:arm64 (15-20250213-1ubuntu1) ... 165s Selecting previously unselected package libtsan2:arm64. 165s Preparing to unpack .../18-libtsan2_15-20250213-1ubuntu1_arm64.deb ... 165s Unpacking libtsan2:arm64 (15-20250213-1ubuntu1) ... 166s Selecting previously unselected package libubsan1:arm64. 166s Preparing to unpack .../19-libubsan1_15-20250213-1ubuntu1_arm64.deb ... 166s Unpacking libubsan1:arm64 (15-20250213-1ubuntu1) ... 166s Selecting previously unselected package libhwasan0:arm64. 166s Preparing to unpack .../20-libhwasan0_15-20250213-1ubuntu1_arm64.deb ... 166s Unpacking libhwasan0:arm64 (15-20250213-1ubuntu1) ... 166s Selecting previously unselected package libgcc-14-dev:arm64. 166s Preparing to unpack .../21-libgcc-14-dev_14.2.0-17ubuntu1_arm64.deb ... 166s Unpacking libgcc-14-dev:arm64 (14.2.0-17ubuntu1) ... 166s Selecting previously unselected package gcc-14-aarch64-linux-gnu. 166s Preparing to unpack .../22-gcc-14-aarch64-linux-gnu_14.2.0-17ubuntu1_arm64.deb ... 166s Unpacking gcc-14-aarch64-linux-gnu (14.2.0-17ubuntu1) ... 166s Selecting previously unselected package gcc-14. 166s Preparing to unpack .../23-gcc-14_14.2.0-17ubuntu1_arm64.deb ... 166s Unpacking gcc-14 (14.2.0-17ubuntu1) ... 166s Selecting previously unselected package gcc-aarch64-linux-gnu. 166s Preparing to unpack .../24-gcc-aarch64-linux-gnu_4%3a14.2.0-1ubuntu1_arm64.deb ... 166s Unpacking gcc-aarch64-linux-gnu (4:14.2.0-1ubuntu1) ... 166s Selecting previously unselected package gcc. 166s Preparing to unpack .../25-gcc_4%3a14.2.0-1ubuntu1_arm64.deb ... 166s Unpacking gcc (4:14.2.0-1ubuntu1) ... 166s Selecting previously unselected package libstdc++-14-dev:arm64. 166s Preparing to unpack .../26-libstdc++-14-dev_14.2.0-17ubuntu1_arm64.deb ... 166s Unpacking libstdc++-14-dev:arm64 (14.2.0-17ubuntu1) ... 167s Selecting previously unselected package g++-14-aarch64-linux-gnu. 167s Preparing to unpack .../27-g++-14-aarch64-linux-gnu_14.2.0-17ubuntu1_arm64.deb ... 167s Unpacking g++-14-aarch64-linux-gnu (14.2.0-17ubuntu1) ... 167s Selecting previously unselected package g++-14. 167s Preparing to unpack .../28-g++-14_14.2.0-17ubuntu1_arm64.deb ... 167s Unpacking g++-14 (14.2.0-17ubuntu1) ... 167s Selecting previously unselected package g++-aarch64-linux-gnu. 167s Preparing to unpack .../29-g++-aarch64-linux-gnu_4%3a14.2.0-1ubuntu1_arm64.deb ... 167s Unpacking g++-aarch64-linux-gnu (4:14.2.0-1ubuntu1) ... 167s Selecting previously unselected package g++. 167s Preparing to unpack .../30-g++_4%3a14.2.0-1ubuntu1_arm64.deb ... 167s Unpacking g++ (4:14.2.0-1ubuntu1) ... 167s Selecting previously unselected package build-essential. 167s Preparing to unpack .../31-build-essential_12.10ubuntu1_arm64.deb ... 167s Unpacking build-essential (12.10ubuntu1) ... 167s Selecting previously unselected package libdebhelper-perl. 167s Preparing to unpack .../32-libdebhelper-perl_13.24.1ubuntu2_all.deb ... 167s Unpacking libdebhelper-perl (13.24.1ubuntu2) ... 167s Selecting previously unselected package libtool. 167s Preparing to unpack .../33-libtool_2.5.4-3build1_all.deb ... 167s Unpacking libtool (2.5.4-3build1) ... 167s Selecting previously unselected package dh-autoreconf. 167s Preparing to unpack .../34-dh-autoreconf_20_all.deb ... 167s Unpacking dh-autoreconf (20) ... 167s Selecting previously unselected package libarchive-zip-perl. 167s Preparing to unpack .../35-libarchive-zip-perl_1.68-1_all.deb ... 167s Unpacking libarchive-zip-perl (1.68-1) ... 167s Selecting previously unselected package libfile-stripnondeterminism-perl. 167s Preparing to unpack .../36-libfile-stripnondeterminism-perl_1.14.1-2_all.deb ... 167s Unpacking libfile-stripnondeterminism-perl (1.14.1-2) ... 167s Selecting previously unselected package dh-strip-nondeterminism. 167s Preparing to unpack .../37-dh-strip-nondeterminism_1.14.1-2_all.deb ... 167s Unpacking dh-strip-nondeterminism (1.14.1-2) ... 167s Selecting previously unselected package debugedit. 167s Preparing to unpack .../38-debugedit_1%3a5.1-2_arm64.deb ... 167s Unpacking debugedit (1:5.1-2) ... 167s Selecting previously unselected package dwz. 167s Preparing to unpack .../39-dwz_0.15-1build6_arm64.deb ... 167s Unpacking dwz (0.15-1build6) ... 167s Selecting previously unselected package gettext. 167s Preparing to unpack .../40-gettext_0.23.1-1_arm64.deb ... 167s Unpacking gettext (0.23.1-1) ... 167s Selecting previously unselected package intltool-debian. 167s Preparing to unpack .../41-intltool-debian_0.35.0+20060710.6_all.deb ... 167s Unpacking intltool-debian (0.35.0+20060710.6) ... 167s Selecting previously unselected package po-debconf. 168s Preparing to unpack .../42-po-debconf_1.0.21+nmu1_all.deb ... 168s Unpacking po-debconf (1.0.21+nmu1) ... 168s Selecting previously unselected package debhelper. 168s Preparing to unpack .../43-debhelper_13.24.1ubuntu2_all.deb ... 168s Unpacking debhelper (13.24.1ubuntu2) ... 168s Selecting previously unselected package dh-python. 168s Preparing to unpack .../44-dh-python_6.20250108_all.deb ... 168s Unpacking dh-python (6.20250108) ... 168s Selecting previously unselected package liberror-perl. 168s Preparing to unpack .../45-liberror-perl_0.17029-2_all.deb ... 168s Unpacking liberror-perl (0.17029-2) ... 168s Selecting previously unselected package git-man. 168s Preparing to unpack .../46-git-man_1%3a2.48.1-0ubuntu1_all.deb ... 168s Unpacking git-man (1:2.48.1-0ubuntu1) ... 168s Selecting previously unselected package git. 168s Preparing to unpack .../47-git_1%3a2.48.1-0ubuntu1_arm64.deb ... 168s Unpacking git (1:2.48.1-0ubuntu1) ... 168s Selecting previously unselected package git-revise. 168s Preparing to unpack .../48-git-revise_0.7.0-1_all.deb ... 168s Unpacking git-revise (0.7.0-1) ... 168s Selecting previously unselected package libexpat1-dev:arm64. 168s Preparing to unpack .../49-libexpat1-dev_2.6.4-1_arm64.deb ... 168s Unpacking libexpat1-dev:arm64 (2.6.4-1) ... 168s Selecting previously unselected package zlib1g-dev:arm64. 168s Preparing to unpack .../50-zlib1g-dev_1%3a1.3.dfsg+really1.3.1-1ubuntu1_arm64.deb ... 168s Unpacking zlib1g-dev:arm64 (1:1.3.dfsg+really1.3.1-1ubuntu1) ... 168s Selecting previously unselected package libpython3.13-dev:arm64. 168s Preparing to unpack .../51-libpython3.13-dev_3.13.2-1_arm64.deb ... 168s Unpacking libpython3.13-dev:arm64 (3.13.2-1) ... 168s Selecting previously unselected package libpython3-dev:arm64. 168s Preparing to unpack .../52-libpython3-dev_3.13.1-1~exp2_arm64.deb ... 168s Unpacking libpython3-dev:arm64 (3.13.1-1~exp2) ... 168s Selecting previously unselected package python3-mypy-extensions. 168s Preparing to unpack .../53-python3-mypy-extensions_1.0.0-1_all.deb ... 168s Unpacking python3-mypy-extensions (1.0.0-1) ... 168s Selecting previously unselected package python3-psutil. 168s Preparing to unpack .../54-python3-psutil_5.9.8-2build3_arm64.deb ... 168s Unpacking python3-psutil (5.9.8-2build3) ... 168s Selecting previously unselected package python3-mypy. 169s Preparing to unpack .../55-python3-mypy_1.15.0-2_arm64.deb ... 169s Unpacking python3-mypy (1.15.0-2) ... 169s Selecting previously unselected package mypy. 169s Preparing to unpack .../56-mypy_1.15.0-2_all.deb ... 169s Unpacking mypy (1.15.0-2) ... 169s Selecting previously unselected package pypy3-dev. 169s Preparing to unpack .../57-pypy3-dev_7.3.18+dfsg-2_all.deb ... 169s Unpacking pypy3-dev (7.3.18+dfsg-2) ... 169s Selecting previously unselected package python3-all. 169s Preparing to unpack .../58-python3-all_3.13.1-1~exp2_arm64.deb ... 169s Unpacking python3-all (3.13.1-1~exp2) ... 169s Selecting previously unselected package python3-iniconfig. 169s Preparing to unpack .../59-python3-iniconfig_1.1.1-2_all.deb ... 169s Unpacking python3-iniconfig (1.1.1-2) ... 169s Selecting previously unselected package python3-packaging. 169s Preparing to unpack .../60-python3-packaging_24.2-1_all.deb ... 169s Unpacking python3-packaging (24.2-1) ... 169s Selecting previously unselected package python3-pluggy. 169s Preparing to unpack .../61-python3-pluggy_1.5.0-1_all.deb ... 169s Unpacking python3-pluggy (1.5.0-1) ... 169s Selecting previously unselected package python3-pytest. 169s Preparing to unpack .../62-python3-pytest_8.3.4-1_all.deb ... 169s Unpacking python3-pytest (8.3.4-1) ... 170s Setting up dh-python (6.20250108) ... 170s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 170s Setting up python3-iniconfig (1.1.1-2) ... 171s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 171s Setting up python3.12-minimal (3.12.9-1) ... 172s Setting up libarchive-zip-perl (1.68-1) ... 172s Setting up python3-mypy-extensions (1.0.0-1) ... 172s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 172s Setting up libdebhelper-perl (13.24.1ubuntu2) ... 172s Setting up python3.12 (3.12.9-1) ... 174s Setting up m4 (1.4.19-5) ... 174s Setting up python3-all (3.13.1-1~exp2) ... 174s Setting up libgomp1:arm64 (15-20250213-1ubuntu1) ... 174s Setting up pypy3 (7.3.18+dfsg-2) ... 174s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 178s running pypy3 rtupdate hooks for 7.3 178s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 189s running pypy3 post-rtupdate hooks for 7.3 189s Setting up python3-psutil (5.9.8-2build3) ... 189s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 190s Setting up liberror-perl (0.17029-2) ... 190s Setting up autotools-dev (20220109.1) ... 190s Setting up python3-packaging (24.2-1) ... 190s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 190s Setting up libexpat1-dev:arm64 (2.6.4-1) ... 190s Setting up libmpc3:arm64 (1.3.1-1build2) ... 190s Setting up python3-mypy (1.15.0-2) ... 193s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 195s Setting up autopoint (0.23.1-1) ... 195s Setting up pypy3-dev (7.3.18+dfsg-2) ... 195s Setting up autoconf (2.72-3) ... 195s Setting up python3-pluggy (1.5.0-1) ... 195s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 195s Setting up libubsan1:arm64 (15-20250213-1ubuntu1) ... 195s Setting up zlib1g-dev:arm64 (1:1.3.dfsg+really1.3.1-1ubuntu1) ... 195s Setting up dwz (0.15-1build6) ... 195s Setting up libhwasan0:arm64 (15-20250213-1ubuntu1) ... 195s Setting up libasan8:arm64 (15-20250213-1ubuntu1) ... 195s Setting up debugedit (1:5.1-2) ... 195s Setting up mypy (1.15.0-2) ... 195s Setting up git-man (1:2.48.1-0ubuntu1) ... 195s Setting up libtsan2:arm64 (15-20250213-1ubuntu1) ... 195s Setting up libisl23:arm64 (0.27-1) ... 195s Setting up libcc1-0:arm64 (15-20250213-1ubuntu1) ... 195s Setting up liblsan0:arm64 (15-20250213-1ubuntu1) ... 195s Setting up libitm1:arm64 (15-20250213-1ubuntu1) ... 195s Setting up automake (1:1.17-3) ... 195s update-alternatives: using /usr/bin/automake-1.17 to provide /usr/bin/automake (automake) in auto mode 195s Setting up libfile-stripnondeterminism-perl (1.14.1-2) ... 195s Setting up gettext (0.23.1-1) ... 195s Setting up python3-pytest (8.3.4-1) ... 196s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 197s Setting up intltool-debian (0.35.0+20060710.6) ... 197s Setting up libpython3.13-dev:arm64 (3.13.2-1) ... 197s Setting up git (1:2.48.1-0ubuntu1) ... 197s Setting up dh-strip-nondeterminism (1.14.1-2) ... 197s Setting up cpp-14-aarch64-linux-gnu (14.2.0-17ubuntu1) ... 197s Setting up git-revise (0.7.0-1) ... 198s Warning: cannot find your CPU L2 & L3 cache size in /sys/devices/system/cpu/cpuX/cache 198s Setting up libgcc-14-dev:arm64 (14.2.0-17ubuntu1) ... 198s Setting up libstdc++-14-dev:arm64 (14.2.0-17ubuntu1) ... 198s Setting up libpython3-dev:arm64 (3.13.1-1~exp2) ... 198s Setting up po-debconf (1.0.21+nmu1) ... 198s Setting up cpp-aarch64-linux-gnu (4:14.2.0-1ubuntu1) ... 198s Setting up cpp-14 (14.2.0-17ubuntu1) ... 198s Setting up cpp (4:14.2.0-1ubuntu1) ... 198s Setting up gcc-14-aarch64-linux-gnu (14.2.0-17ubuntu1) ... 198s Setting up gcc-aarch64-linux-gnu (4:14.2.0-1ubuntu1) ... 198s Setting up g++-14-aarch64-linux-gnu (14.2.0-17ubuntu1) ... 198s Setting up gcc-14 (14.2.0-17ubuntu1) ... 198s Setting up g++-aarch64-linux-gnu (4:14.2.0-1ubuntu1) ... 198s Setting up g++-14 (14.2.0-17ubuntu1) ... 198s Setting up libtool (2.5.4-3build1) ... 198s Setting up gcc (4:14.2.0-1ubuntu1) ... 198s Setting up dh-autoreconf (20) ... 198s Setting up g++ (4:14.2.0-1ubuntu1) ... 198s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 198s Setting up build-essential (12.10ubuntu1) ... 198s Setting up debhelper (13.24.1ubuntu2) ... 198s Processing triggers for man-db (2.13.0-1) ... 199s Processing triggers for install-info (7.1.1-1) ... 200s Processing triggers for libc-bin (2.40-4ubuntu1) ... 200s Processing triggers for systemd (257.2-3ubuntu1) ... 201s autopkgtest [04:18:46]: test command1: pytest-3 201s autopkgtest [04:18:46]: test command1: [----------------------- 202s ============================= test session starts ============================== 202s platform linux -- Python 3.13.2, pytest-8.3.4, pluggy-1.5.0 202s rootdir: /tmp/autopkgtest.dej4m0/build.CDj/src 202s plugins: typeguard-4.4.1 202s collected 38 items 202s 202s tests/test_cut.py .. [ 5%] 205s tests/test_fixup.py .............. [ 42%] 206s tests/test_gpgsign.py . [ 44%] 211s tests/test_interactive.py .......... [ 71%] 224s tests/test_rerere.py FFF.. [ 84%] 226s tests/test_reword.py ...... [100%] 226s 226s =================================== FAILURES =================================== 226s ________________________ test_reuse_recorded_resolution ________________________ 226s 226s repo = 226s 226s def test_reuse_recorded_resolution(repo): 226s history_with_two_conflicting_commits(autoUpdate=True) 226s 226s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 226s flip_last_two_commits(repo, ed) 226s with ed.next_file() as f: 226s f.replace_dedent("resolved two\n") 226s with ed.next_file() as f: 226s f.replace_dedent("resolved one\n") 226s 226s tree_after_resolving_conflicts = repo.get_commit("HEAD").tree() 226s bash("git reset --hard HEAD@{1}") 226s 226s # Now we can change the order of the two commits and reuse the recorded conflict resolution. 226s with editor_main(("-i", "HEAD~~")) as ed: 226s flip_last_two_commits(repo, ed) 226s 226s assert tree_after_resolving_conflicts == repo.get_commit("HEAD").tree() 226s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 226s 226s /tmp/autopkgtest.dej4m0/build.CDj/src/tests/test_rerere.py:39: 226s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 226s 226s diff = b'' 226s 226s def hunks(diff: bytes) -> bytes: 226s > return diff[diff.index(b"@@") :] 226s E ValueError: subsection not found 226s 226s /tmp/autopkgtest.dej4m0/build.CDj/src/tests/test_rerere.py:370: ValueError 226s ----------------------------- Captured stdout call ----------------------------- 226s [master (root-commit) d72132e] initial commit 226s Author: Bash Author 226s 1 file changed, 1 insertion(+) 226s create mode 100644 file 226s [master 698fe81] commit one 226s Author: Bash Author 226s 1 file changed, 1 insertion(+), 1 deletion(-) 226s [master b1efb1b] commit two 226s Author: Bash Author 226s 1 file changed, 1 insertion(+), 1 deletion(-) 226s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 226s Conflict applying 'commit two' 226s Path: '/file' 226s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 226s pick e51ab202e87f commit two 226s Conflict applying 'commit one' 226s Path: '/file' 226s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 226s pick dc50430ecbd2 commit one 226s Updating refs/heads/master (b1efb1b8ffe680f67bd9e6824fcf0aa55d561139 => dc50430ecbd2d0697ee9266ba6057e0e0b511d7f) 226s HEAD is now at dc50430 commit one 226s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'check': True} 226s Conflict applying 'commit one' 226s Path: '/file' 226s Edit conflicted file? (Y/n) 226s ----------------------------- Captured stderr call ----------------------------- 226s 127.0.0.1 - - [19/Feb/2025 04:18:56] "POST / HTTP/1.1" 200 - 226s 127.0.0.1 - - [19/Feb/2025 04:18:56] "POST / HTTP/1.1" 200 - 226s 127.0.0.1 - - [19/Feb/2025 04:18:56] "POST / HTTP/1.1" 200 - 226s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 226s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 226s 127.0.0.1 - - [19/Feb/2025 04:18:56] "POST / HTTP/1.1" 200 - 226s Traceback (most recent call last): 226s File "", line 198, in _run_module_as_main 226s File "", line 88, in _run_code 226s File "/usr/lib/python3/dist-packages/gitrevise/__main__.py", line 4, in 226s main() 226s ~~~~^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 263, in main 226s inner_main(args, repo) 226s ~~~~~~~~~~^^^^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 254, in inner_main 226s interactive(args, repo, staged, head) 226s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 141, in interactive 226s new_head = apply_todos(base, todos, reauthor=args.reauthor) 226s File "/usr/lib/python3/dist-packages/gitrevise/todo.py", line 251, in apply_todos 226s rebased = step.commit.rebase(current).update(message=step.message) 226s ~~~~~~~~~~~~~~~~~~^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/odb.py", line 621, in rebase 226s return rebase(self, parent) 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 47, in rebase 226s tree = merge_trees( 226s Path("/"), 226s ...<3 lines>... 226s get_tree(commit), 226s ) 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 90, in merge_trees 226s merged = merge_entries( 226s path / name.decode(errors="replace"), 226s ...<3 lines>... 226s other.entries.get(name), 226s ) 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 165, in merge_entries 226s merge_blobs(path, labels, current.blob(), baseblob, other.blob()).oid, 226s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 235, in merge_blobs 226s if input(" Edit conflicted file? (Y/n) ").lower() == "n": 226s ~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s EOFError: EOF when reading a line 226s __________________________ test_rerere_no_autoupdate ___________________________ 226s 226s repo = 226s 226s def test_rerere_no_autoupdate(repo): 226s history_with_two_conflicting_commits(autoUpdate=False) 226s 226s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 226s flip_last_two_commits(repo, ed) 226s with ed.next_file() as f: 226s f.replace_dedent("resolved two\n") 226s with ed.next_file() as f: 226s f.replace_dedent("resolved one\n") 226s 226s tree_after_resolving_conflicts = repo.get_commit("HEAD").tree() 226s bash("git reset --hard HEAD@{1}") 226s 226s # Use the recorded resolution by confirming both times. 226s with editor_main(("-i", "HEAD~~"), input=b"y\ny\n") as ed: 226s flip_last_two_commits(repo, ed) 226s assert tree_after_resolving_conflicts == repo.get_commit("HEAD").tree() 226s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 226s 226s /tmp/autopkgtest.dej4m0/build.CDj/src/tests/test_rerere.py:76: 226s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 226s 226s diff = b'' 226s 226s def hunks(diff: bytes) -> bytes: 226s > return diff[diff.index(b"@@") :] 226s E ValueError: subsection not found 226s 226s /tmp/autopkgtest.dej4m0/build.CDj/src/tests/test_rerere.py:370: ValueError 226s ----------------------------- Captured stdout call ----------------------------- 226s [master (root-commit) d72132e] initial commit 226s Author: Bash Author 226s 1 file changed, 1 insertion(+) 226s create mode 100644 file 226s [master 698fe81] commit one 226s Author: Bash Author 226s 1 file changed, 1 insertion(+), 1 deletion(-) 226s [master b1efb1b] commit two 226s Author: Bash Author 226s 1 file changed, 1 insertion(+), 1 deletion(-) 226s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 226s Conflict applying 'commit two' 226s Path: '/file' 226s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 226s pick e51ab202e87f commit two 226s Conflict applying 'commit one' 226s Path: '/file' 226s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 226s pick dc50430ecbd2 commit one 226s Updating refs/heads/master (b1efb1b8ffe680f67bd9e6824fcf0aa55d561139 => dc50430ecbd2d0697ee9266ba6057e0e0b511d7f) 226s HEAD is now at dc50430 commit one 226s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\n', 'check': True} 226s Conflict applying 'commit one' 226s Path: '/file' 226s Edit conflicted file? (Y/n) editor error: Editor exited with status Command '['/bin/sh', '-ec', '/usr/bin/python3 /tmp/autopkgtest.dej4m0/build.CDj/src/tests/dummy_editor.py http://127.0.0.1:37243/ "$@"', '/usr/bin/python3 /tmp/autopkgtest.dej4m0/build.CDj/src/tests/dummy_editor.py http://127.0.0.1:37243/', 'file']' returned non-zero exit status 1. 226s ----------------------------- Captured stderr call ----------------------------- 226s 127.0.0.1 - - [19/Feb/2025 04:18:57] "POST / HTTP/1.1" 200 - 226s 127.0.0.1 - - [19/Feb/2025 04:18:57] "POST / HTTP/1.1" 200 - 226s 127.0.0.1 - - [19/Feb/2025 04:18:57] "POST / HTTP/1.1" 200 - 226s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 226s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 226s 127.0.0.1 - - [19/Feb/2025 04:18:57] "POST / HTTP/1.1" 200 - 226s Traceback (most recent call last): 226s File "/tmp/autopkgtest.dej4m0/build.CDj/src/tests/dummy_editor.py", line 17, in 226s run_editor(url=sys.argv[1], path=Path(sys.argv[2]).resolve()) 226s ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s File "/tmp/autopkgtest.dej4m0/build.CDj/src/tests/dummy_editor.py", line 8, in run_editor 226s with urlopen(url, data=path.read_bytes(), timeout=10) as r: 226s ~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s File "/usr/lib/python3.13/urllib/request.py", line 189, in urlopen 226s return opener.open(url, data, timeout) 226s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^ 226s File "/usr/lib/python3.13/urllib/request.py", line 489, in open 226s response = self._open(req, data) 226s File "/usr/lib/python3.13/urllib/request.py", line 506, in _open 226s result = self._call_chain(self.handle_open, protocol, protocol + 226s '_open', req) 226s File "/usr/lib/python3.13/urllib/request.py", line 466, in _call_chain 226s result = func(*args) 226s File "/usr/lib/python3.13/urllib/request.py", line 1348, in http_open 226s return self.do_open(http.client.HTTPConnection, req) 226s ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s File "/usr/lib/python3.13/urllib/request.py", line 1323, in do_open 226s r = h.getresponse() 226s File "/usr/lib/python3.13/http/client.py", line 1430, in getresponse 226s response.begin() 226s ~~~~~~~~~~~~~~^^ 226s File "/usr/lib/python3.13/http/client.py", line 331, in begin 226s version, status, reason = self._read_status() 226s ~~~~~~~~~~~~~~~~~^^ 226s File "/usr/lib/python3.13/http/client.py", line 292, in _read_status 226s line = str(self.fp.readline(_MAXLINE + 1), "iso-8859-1") 226s ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^ 226s File "/usr/lib/python3.13/socket.py", line 719, in readinto 226s return self._sock.recv_into(b) 226s ~~~~~~~~~~~~~~~~~~~~^^^ 226s TimeoutError: timed out 226s ______________________________ test_rerere_merge _______________________________ 226s 226s repo = 226s 226s def test_rerere_merge(repo): 226s (repo.workdir / "file").write_bytes(10 * b"x\n") 226s bash( 226s """ 226s git config rerere.enabled true 226s git config rerere.autoUpdate true 226s git add file; git commit -m 'initial commit' 226s """ 226s ) 226s changeline("file", 0, b"original1\n") 226s bash("git commit -am 'commit 1'") 226s changeline("file", 0, b"original2\n") 226s bash("git commit -am 'commit 2'") 226s 226s # Record a resolution for changing the order of two commits. 226s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 226s flip_last_two_commits(repo, ed) 226s with ed.next_file() as f: 226s f.replace_dedent(b"resolved1\n" + 9 * b"x\n") 226s with ed.next_file() as f: 226s f.replace_dedent(b"resolved2\n" + 9 * b"x\n") 226s # Go back to the old history so we can try replaying the resolution. 226s bash("git reset --hard HEAD@{1}") 226s 226s # Introduce an unrelated change that will not conflict to check that we can 226s # merge the file contents, and not just use the recorded postimage as is. 226s changeline("file", 9, b"unrelated change, present in all commits\n") 226s bash("git add file") 226s main(["HEAD~2"]) 226s 226s with editor_main(("-i", "HEAD~~")) as ed: 226s flip_last_two_commits(repo, ed) 226s 226s assert hunks(repo.git("show", "-U0", "HEAD~")) == dedent( 226s """\ 226s @@ -1 +1 @@ 226s -x 226s +resolved1""" 226s ) 226s assert hunks(repo.git("show", "-U0", "HEAD")) == dedent( 226s """\ 226s @@ -1 +1 @@ 226s -resolved1 226s +resolved2""" 226s ) 226s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 226s 226s /tmp/autopkgtest.dej4m0/build.CDj/src/tests/test_rerere.py:144: 226s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 226s 226s diff = b'' 226s 226s def hunks(diff: bytes) -> bytes: 226s > return diff[diff.index(b"@@") :] 226s E ValueError: subsection not found 226s 226s /tmp/autopkgtest.dej4m0/build.CDj/src/tests/test_rerere.py:370: ValueError 226s ----------------------------- Captured stdout call ----------------------------- 226s [master (root-commit) 78ab633] initial commit 226s Author: Bash Author 226s 1 file changed, 10 insertions(+) 226s create mode 100644 file 226s [master bc4398a] commit 1 226s Author: Bash Author 226s 1 file changed, 1 insertion(+), 1 deletion(-) 226s [master 8ede3c3] commit 2 226s Author: Bash Author 226s 1 file changed, 1 insertion(+), 1 deletion(-) 226s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 226s Conflict applying 'commit 2' 226s Path: '/file' 226s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 226s pick 8d5d4e07cf09 commit 2 226s Conflict applying 'commit 1' 226s Path: '/file' 226s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 226s pick 4afa53fa2fa8 commit 1 226s Updating refs/heads/master (8ede3c350c17709e6a2b5f4775e4a12770b88dc1 => 4afa53fa2fa843a3a089d55050139011198ab3d0) 226s HEAD is now at 4afa53f commit 1 226s Running ['/usr/bin/python3', '-m', 'gitrevise', 'HEAD~2'] {'check': True} 226s Applying staged changes to 'HEAD~2' 226s 035bca1522bd initial commit 226s 712c4d25b5e2 commit 2 226s 33e258e25f6a commit 1 226s Updating refs/heads/master (4afa53fa2fa843a3a089d55050139011198ab3d0 => 33e258e25f6a8d5629beb2c02cb1b7e388b61791) 226s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'check': True} 226s Conflict applying 'commit 1' 226s Path: '/file' 226s Edit conflicted file? (Y/n) 226s ----------------------------- Captured stderr call ----------------------------- 226s 127.0.0.1 - - [19/Feb/2025 04:19:07] "POST / HTTP/1.1" 200 - 226s 127.0.0.1 - - [19/Feb/2025 04:19:08] "POST / HTTP/1.1" 200 - 226s 127.0.0.1 - - [19/Feb/2025 04:19:08] "POST / HTTP/1.1" 200 - 226s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 226s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 226s 127.0.0.1 - - [19/Feb/2025 04:19:08] "POST / HTTP/1.1" 200 - 226s Traceback (most recent call last): 226s File "", line 198, in _run_module_as_main 226s File "", line 88, in _run_code 226s File "/usr/lib/python3/dist-packages/gitrevise/__main__.py", line 4, in 226s main() 226s ~~~~^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 263, in main 226s inner_main(args, repo) 226s ~~~~~~~~~~^^^^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 254, in inner_main 226s interactive(args, repo, staged, head) 226s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 141, in interactive 226s new_head = apply_todos(base, todos, reauthor=args.reauthor) 226s File "/usr/lib/python3/dist-packages/gitrevise/todo.py", line 251, in apply_todos 226s rebased = step.commit.rebase(current).update(message=step.message) 226s ~~~~~~~~~~~~~~~~~~^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/odb.py", line 621, in rebase 226s return rebase(self, parent) 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 47, in rebase 226s tree = merge_trees( 226s Path("/"), 226s ...<3 lines>... 226s get_tree(commit), 226s ) 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 90, in merge_trees 226s merged = merge_entries( 226s path / name.decode(errors="replace"), 226s ...<3 lines>... 226s other.entries.get(name), 226s ) 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 165, in merge_entries 226s merge_blobs(path, labels, current.blob(), baseblob, other.blob()).oid, 226s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 235, in merge_blobs 226s if input(" Edit conflicted file? (Y/n) ").lower() == "n": 226s ~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 226s EOFError: EOF when reading a line 226s =========================== short test summary info ============================ 226s FAILED tests/test_rerere.py::test_reuse_recorded_resolution - ValueError: sub... 226s FAILED tests/test_rerere.py::test_rerere_no_autoupdate - ValueError: subsecti... 226s FAILED tests/test_rerere.py::test_rerere_merge - ValueError: subsection not f... 226s ======================== 3 failed, 35 passed in 24.27s ========================= 226s autopkgtest [04:19:11]: test command1: -----------------------] 227s autopkgtest [04:19:12]: test command1: - - - - - - - - - - results - - - - - - - - - - 227s command1 FAIL non-zero exit status 1 227s autopkgtest [04:19:12]: @@@@@@@@@@@@@@@@@@@@ summary 227s command1 FAIL non-zero exit status 1 246s nova [W] Using flock in prodstack6-arm64 246s Creating nova instance adt-plucky-arm64-git-revise-20250219-041525-juju-7f2275-prod-proposed-migration-environment-2-463fb041-3d2b-4ce9-8fc1-a7943d3ede31 from image adt/ubuntu-plucky-arm64-server-20250218.img (UUID db1e3557-ca0b-4978-8424-9ef955671030)... 246s nova [W] Timed out waiting for 859c59cf-e51e-4017-9a93-453e8878def7 to get deleted.