0s autopkgtest [04:20:35]: starting date and time: 2025-02-19 04:20:35+0000 0s autopkgtest [04:20:35]: git checkout: 325255d2 Merge branch 'pin-any-arch' into 'ubuntu/production' 0s autopkgtest [04:20:35]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.ili4eli6/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 builder-cpu2-ram4-disk20 --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@bos03-8.secgroup --name adt-plucky-amd64-git-revise-20250219-042035-juju-7f2275-prod-proposed-migration-environment-15-8384f3cc-1978-44bf-a3e5-7f40a1db5adf --image adt/ubuntu-plucky-amd64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-proposed-migration-amd64 -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/ 211s autopkgtest [04:24:06]: testbed dpkg architecture: amd64 211s autopkgtest [04:24:06]: testbed apt version: 2.9.29 212s autopkgtest [04:24:07]: @@@@@@@@@@@@@@@@@@@@ test bed setup 212s autopkgtest [04:24:07]: testbed release detected to be: None 213s autopkgtest [04:24:08]: updating testbed package index (apt update) 213s Get:1 http://ftpmaster.internal/ubuntu plucky-proposed InRelease [110 kB] 213s Hit:2 http://ftpmaster.internal/ubuntu plucky InRelease 213s Hit:3 http://ftpmaster.internal/ubuntu plucky-updates InRelease 213s Hit:4 http://ftpmaster.internal/ubuntu plucky-security InRelease 213s Get:5 http://ftpmaster.internal/ubuntu plucky-proposed/main Sources [79.1 kB] 213s Get:6 http://ftpmaster.internal/ubuntu plucky-proposed/restricted Sources [3120 B] 213s Get:7 http://ftpmaster.internal/ubuntu plucky-proposed/multiverse Sources [14.6 kB] 213s Get:8 http://ftpmaster.internal/ubuntu plucky-proposed/universe Sources [788 kB] 214s Get:9 http://ftpmaster.internal/ubuntu plucky-proposed/main i386 Packages [84.0 kB] 214s Get:10 http://ftpmaster.internal/ubuntu plucky-proposed/main amd64 Packages [106 kB] 214s Get:11 http://ftpmaster.internal/ubuntu plucky-proposed/restricted i386 Packages [2412 B] 214s Get:12 http://ftpmaster.internal/ubuntu plucky-proposed/restricted amd64 Packages [7984 B] 214s Get:13 http://ftpmaster.internal/ubuntu plucky-proposed/universe amd64 Packages [712 kB] 214s Get:14 http://ftpmaster.internal/ubuntu plucky-proposed/universe i386 Packages [271 kB] 214s Get:15 http://ftpmaster.internal/ubuntu plucky-proposed/multiverse amd64 Packages [12.4 kB] 214s Get:16 http://ftpmaster.internal/ubuntu plucky-proposed/multiverse i386 Packages [3440 B] 214s Fetched 2194 kB in 1s (1893 kB/s) 215s Reading package lists... 215s + lsb_release --codename --short 215s Reading package lists... 215s Building dependency tree...+ RELEASE=plucky 215s + cat 215s + [ plucky != trusty ] 215s + DEBIAN_FRONTEND=noninteractive eatmydata apt-get -y --allow-downgrades -o Dpkg::Options::=--force-confnew dist-upgrade 216s 216s Reading state information... 216s Calculating upgrade... 216s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 216s + rm /etc/apt/preferences.d/force-downgrade-to-release.pref 216s + /usr/lib/apt/apt-helper analyze-pattern ?true 216s + uname -r 216s + sed s/\./\\./g 216s + running_kernel_pattern=^linux-.*6\.12\.0-15-generic.* 216s + apt list ?obsolete 216s + tail -n+2 216s + cut -d/ -f1 216s + grep -v ^linux-.*6\.12\.0-15-generic.* 217s + true 217s + obsolete_pkgs= 217s + DEBIAN_FRONTEND=noninteractive eatmydata apt-get -y purge --autoremove 217s Reading package lists... 217s Building dependency tree... 217s Reading state information... 218s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 218s + grep -q trusty /etc/lsb-release 218s + [ ! -d /usr/share/doc/unattended-upgrades ] 218s + [ ! -d /usr/share/doc/lxd ] 218s + [ ! -d /usr/share/doc/lxd-client ] 218s + [ ! -d /usr/share/doc/snapd ] 218s + type iptables 218s + cat 218s + chmod 755 /etc/rc.local 218s + . /etc/rc.local 218s + iptables -w -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu 218s + iptables -A OUTPUT -d 10.255.255.1/32 -p tcp -j DROP 218s + iptables -A OUTPUT -d 10.255.255.2/32 -p tcp -j DROP 218s + uname -m 218s + [ x86_64 = ppc64le ] 218s + [ -d /run/systemd/system ] 218s + systemd-detect-virt --quiet --vm 218s + mkdir -p /etc/systemd/system/systemd-random-seed.service.d/ 218s + cat 218s + grep -q lz4 /etc/initramfs-tools/initramfs.conf 218s + echo COMPRESS=lz4 218s autopkgtest [04:24:13]: upgrading testbed (apt dist-upgrade and autopurge) 218s Reading package lists... 218s Building dependency tree... 218s Reading state information... 219s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 219s Starting 2 pkgProblemResolver with broken count: 0 219s Done 219s Entering ResolveByKeep 220s 220s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 220s Reading package lists... 220s Building dependency tree... 220s Reading state information... 221s Starting pkgProblemResolver with broken count: 0 221s Starting 2 pkgProblemResolver with broken count: 0 221s Done 221s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 223s autopkgtest [04:24:18]: testbed running kernel: Linux 6.12.0-15-generic #15-Ubuntu SMP PREEMPT_DYNAMIC Tue Feb 4 16:02:16 UTC 2025 224s autopkgtest [04:24:19]: @@@@@@@@@@@@@@@@@@@@ apt-source git-revise 227s Get:1 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (dsc) [1879 B] 227s Get:2 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (tar) [35.6 kB] 227s Get:3 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (diff) [3456 B] 227s gpgv: Signature made Wed Mar 30 16:15:29 2022 UTC 227s gpgv: using RSA key 406220C8B8552802378CCE411F5C7A8B45564314 227s gpgv: issuer "bage@debian.org" 227s gpgv: Can't check signature: No public key 227s dpkg-source: warning: cannot verify inline signature for ./git-revise_0.7.0-1.dsc: no acceptable signature found 227s autopkgtest [04:24:21]: testing package git-revise version 0.7.0-1 228s autopkgtest [04:24:23]: build not needed 228s autopkgtest [04:24:23]: test command1: preparing testbed 228s Reading package lists... 228s Building dependency tree... 228s Reading state information... 229s Starting pkgProblemResolver with broken count: 0 229s Starting 2 pkgProblemResolver with broken count: 0 229s Done 229s The following NEW packages will be installed: 229s autoconf automake autopoint autotools-dev build-essential cpp cpp-14 229s cpp-14-x86-64-linux-gnu cpp-x86-64-linux-gnu debhelper debugedit 229s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-14 229s g++-14-x86-64-linux-gnu g++-x86-64-linux-gnu gcc gcc-14 229s gcc-14-x86-64-linux-gnu gcc-x86-64-linux-gnu gettext git git-man git-revise 229s intltool-debian libarchive-zip-perl libasan8 libcc1-0 libdebhelper-perl 229s liberror-perl libexpat1-dev libfile-stripnondeterminism-perl libgcc-14-dev 229s libgomp1 libhwasan0 libisl23 libitm1 liblsan0 libmpc3 libpython3-dev 229s libpython3.13-dev libquadmath0 libstdc++-14-dev libtool libtsan2 libubsan1 229s m4 mypy po-debconf pypy3 pypy3-dev pypy3-lib python3-all python3-iniconfig 229s python3-mypy python3-mypy-extensions python3-packaging python3-pluggy 229s python3-psutil python3-pytest python3.12 python3.12-minimal zlib1g-dev 229s 0 upgraded, 66 newly installed, 0 to remove and 0 not upgraded. 229s Need to get 118 MB of archives. 229s After this operation, 462 MB of additional disk space will be used. 229s Get:1 http://ftpmaster.internal/ubuntu plucky/main amd64 python3.12-minimal amd64 3.12.9-1 [2348 kB] 230s Get:2 http://ftpmaster.internal/ubuntu plucky/universe amd64 pypy3-lib amd64 7.3.18+dfsg-2 [2872 kB] 231s Get:3 http://ftpmaster.internal/ubuntu plucky/universe amd64 pypy3 amd64 7.3.18+dfsg-2 [13.2 MB] 232s Get:4 http://ftpmaster.internal/ubuntu plucky/main amd64 python3.12 amd64 3.12.9-1 [671 kB] 232s Get:5 http://ftpmaster.internal/ubuntu plucky/main amd64 m4 amd64 1.4.19-5 [263 kB] 232s Get:6 http://ftpmaster.internal/ubuntu plucky/main amd64 autoconf all 2.72-3 [382 kB] 232s Get:7 http://ftpmaster.internal/ubuntu plucky/main amd64 autotools-dev all 20220109.1 [44.9 kB] 232s Get:8 http://ftpmaster.internal/ubuntu plucky/main amd64 automake all 1:1.17-3 [572 kB] 232s Get:9 http://ftpmaster.internal/ubuntu plucky/main amd64 autopoint all 0.23.1-1 [619 kB] 232s Get:10 http://ftpmaster.internal/ubuntu plucky/main amd64 libisl23 amd64 0.27-1 [685 kB] 232s Get:11 http://ftpmaster.internal/ubuntu plucky/main amd64 libmpc3 amd64 1.3.1-1build2 [55.3 kB] 232s Get:12 http://ftpmaster.internal/ubuntu plucky/main amd64 cpp-14-x86-64-linux-gnu amd64 14.2.0-17ubuntu1 [11.9 MB] 233s Get:13 http://ftpmaster.internal/ubuntu plucky/main amd64 cpp-14 amd64 14.2.0-17ubuntu1 [1032 B] 233s Get:14 http://ftpmaster.internal/ubuntu plucky/main amd64 cpp-x86-64-linux-gnu amd64 4:14.2.0-1ubuntu1 [5586 B] 233s Get:15 http://ftpmaster.internal/ubuntu plucky/main amd64 cpp amd64 4:14.2.0-1ubuntu1 [22.4 kB] 233s Get:16 http://ftpmaster.internal/ubuntu plucky/main amd64 libcc1-0 amd64 15-20250213-1ubuntu1 [47.0 kB] 233s Get:17 http://ftpmaster.internal/ubuntu plucky/main amd64 libgomp1 amd64 15-20250213-1ubuntu1 [148 kB] 233s Get:18 http://ftpmaster.internal/ubuntu plucky/main amd64 libitm1 amd64 15-20250213-1ubuntu1 [28.5 kB] 233s Get:19 http://ftpmaster.internal/ubuntu plucky/main amd64 libasan8 amd64 15-20250213-1ubuntu1 [3059 kB] 233s Get:20 http://ftpmaster.internal/ubuntu plucky/main amd64 liblsan0 amd64 15-20250213-1ubuntu1 [1356 kB] 233s Get:21 http://ftpmaster.internal/ubuntu plucky/main amd64 libtsan2 amd64 15-20250213-1ubuntu1 [2757 kB] 233s Get:22 http://ftpmaster.internal/ubuntu plucky/main amd64 libubsan1 amd64 15-20250213-1ubuntu1 [1206 kB] 233s Get:23 http://ftpmaster.internal/ubuntu plucky/main amd64 libhwasan0 amd64 15-20250213-1ubuntu1 [1678 kB] 233s Get:24 http://ftpmaster.internal/ubuntu plucky/main amd64 libquadmath0 amd64 15-20250213-1ubuntu1 [152 kB] 233s Get:25 http://ftpmaster.internal/ubuntu plucky/main amd64 libgcc-14-dev amd64 14.2.0-17ubuntu1 [2814 kB] 233s Get:26 http://ftpmaster.internal/ubuntu plucky/main amd64 gcc-14-x86-64-linux-gnu amd64 14.2.0-17ubuntu1 [23.3 MB] 234s Get:27 http://ftpmaster.internal/ubuntu plucky/main amd64 gcc-14 amd64 14.2.0-17ubuntu1 [536 kB] 234s Get:28 http://ftpmaster.internal/ubuntu plucky/main amd64 gcc-x86-64-linux-gnu amd64 4:14.2.0-1ubuntu1 [1208 B] 234s Get:29 http://ftpmaster.internal/ubuntu plucky/main amd64 gcc amd64 4:14.2.0-1ubuntu1 [5004 B] 234s Get:30 http://ftpmaster.internal/ubuntu plucky/main amd64 libstdc++-14-dev amd64 14.2.0-17ubuntu1 [2507 kB] 234s Get:31 http://ftpmaster.internal/ubuntu plucky/main amd64 g++-14-x86-64-linux-gnu amd64 14.2.0-17ubuntu1 [13.4 MB] 234s Get:32 http://ftpmaster.internal/ubuntu plucky/main amd64 g++-14 amd64 14.2.0-17ubuntu1 [21.8 kB] 234s Get:33 http://ftpmaster.internal/ubuntu plucky/main amd64 g++-x86-64-linux-gnu amd64 4:14.2.0-1ubuntu1 [968 B] 234s Get:34 http://ftpmaster.internal/ubuntu plucky/main amd64 g++ amd64 4:14.2.0-1ubuntu1 [1100 B] 234s Get:35 http://ftpmaster.internal/ubuntu plucky/main amd64 build-essential amd64 12.10ubuntu1 [4928 B] 234s Get:36 http://ftpmaster.internal/ubuntu plucky/main amd64 libdebhelper-perl all 13.24.1ubuntu2 [95.4 kB] 234s Get:37 http://ftpmaster.internal/ubuntu plucky/main amd64 libtool all 2.5.4-3build1 [168 kB] 234s Get:38 http://ftpmaster.internal/ubuntu plucky/main amd64 dh-autoreconf all 20 [16.1 kB] 234s Get:39 http://ftpmaster.internal/ubuntu plucky/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 234s Get:40 http://ftpmaster.internal/ubuntu plucky/main amd64 libfile-stripnondeterminism-perl all 1.14.1-2 [20.3 kB] 234s Get:41 http://ftpmaster.internal/ubuntu plucky/main amd64 dh-strip-nondeterminism all 1.14.1-2 [5064 B] 234s Get:42 http://ftpmaster.internal/ubuntu plucky/main amd64 debugedit amd64 1:5.1-2 [47.0 kB] 234s Get:43 http://ftpmaster.internal/ubuntu plucky/main amd64 dwz amd64 0.15-1build6 [115 kB] 234s Get:44 http://ftpmaster.internal/ubuntu plucky/main amd64 gettext amd64 0.23.1-1 [1086 kB] 234s Get:45 http://ftpmaster.internal/ubuntu plucky/main amd64 intltool-debian all 0.35.0+20060710.6 [23.2 kB] 234s Get:46 http://ftpmaster.internal/ubuntu plucky/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 234s Get:47 http://ftpmaster.internal/ubuntu plucky/main amd64 debhelper all 13.24.1ubuntu2 [895 kB] 234s Get:48 http://ftpmaster.internal/ubuntu plucky/universe amd64 dh-python all 6.20250108 [117 kB] 234s Get:49 http://ftpmaster.internal/ubuntu plucky/main amd64 liberror-perl all 0.17029-2 [25.6 kB] 234s Get:50 http://ftpmaster.internal/ubuntu plucky-proposed/main amd64 git-man all 1:2.48.1-0ubuntu1 [1148 kB] 234s Get:51 http://ftpmaster.internal/ubuntu plucky-proposed/main amd64 git amd64 1:2.48.1-0ubuntu1 [4759 kB] 234s Get:52 http://ftpmaster.internal/ubuntu plucky/universe amd64 git-revise all 0.7.0-1 [31.7 kB] 234s Get:53 http://ftpmaster.internal/ubuntu plucky/main amd64 libexpat1-dev amd64 2.6.4-1 [148 kB] 234s Get:54 http://ftpmaster.internal/ubuntu plucky/main amd64 zlib1g-dev amd64 1:1.3.dfsg+really1.3.1-1ubuntu1 [895 kB] 234s Get:55 http://ftpmaster.internal/ubuntu plucky/main amd64 libpython3.13-dev amd64 3.13.2-1 [5501 kB] 235s Get:56 http://ftpmaster.internal/ubuntu plucky/main amd64 libpython3-dev amd64 3.13.1-1~exp2 [10.5 kB] 235s Get:57 http://ftpmaster.internal/ubuntu plucky/universe amd64 python3-mypy-extensions all 1.0.0-1 [6148 B] 235s Get:58 http://ftpmaster.internal/ubuntu plucky/main amd64 python3-psutil amd64 5.9.8-2build3 [196 kB] 235s Get:59 http://ftpmaster.internal/ubuntu plucky/universe amd64 python3-mypy amd64 1.15.0-2 [15.8 MB] 236s Get:60 http://ftpmaster.internal/ubuntu plucky/universe amd64 mypy all 1.15.0-2 [25.4 kB] 236s Get:61 http://ftpmaster.internal/ubuntu plucky/universe amd64 pypy3-dev all 7.3.18+dfsg-2 [79.9 kB] 236s Get:62 http://ftpmaster.internal/ubuntu plucky/main amd64 python3-all amd64 3.13.1-1~exp2 [894 B] 236s Get:63 http://ftpmaster.internal/ubuntu plucky/universe amd64 python3-iniconfig all 1.1.1-2 [6024 B] 236s Get:64 http://ftpmaster.internal/ubuntu plucky/main amd64 python3-packaging all 24.2-1 [51.5 kB] 236s Get:65 http://ftpmaster.internal/ubuntu plucky/universe amd64 python3-pluggy all 1.5.0-1 [21.0 kB] 236s Get:66 http://ftpmaster.internal/ubuntu plucky/universe amd64 python3-pytest all 8.3.4-1 [252 kB] 236s Fetched 118 MB in 6s (19.4 MB/s) 236s Selecting previously unselected package python3.12-minimal. 236s (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 ... 108925 files and directories currently installed.) 236s Preparing to unpack .../python3.12-minimal_3.12.9-1_amd64.deb ... 236s Unpacking python3.12-minimal (3.12.9-1) ... 236s Selecting previously unselected package pypy3-lib:amd64. 236s Preparing to unpack .../pypy3-lib_7.3.18+dfsg-2_amd64.deb ... 236s Unpacking pypy3-lib:amd64 (7.3.18+dfsg-2) ... 236s Setting up pypy3-lib:amd64 (7.3.18+dfsg-2) ... 236s Selecting previously unselected package pypy3. 237s (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 ... 110185 files and directories currently installed.) 237s Preparing to unpack .../00-pypy3_7.3.18+dfsg-2_amd64.deb ... 237s Unpacking pypy3 (7.3.18+dfsg-2) ... 237s Selecting previously unselected package python3.12. 237s Preparing to unpack .../01-python3.12_3.12.9-1_amd64.deb ... 237s Unpacking python3.12 (3.12.9-1) ... 237s Selecting previously unselected package m4. 237s Preparing to unpack .../02-m4_1.4.19-5_amd64.deb ... 237s Unpacking m4 (1.4.19-5) ... 237s Selecting previously unselected package autoconf. 237s Preparing to unpack .../03-autoconf_2.72-3_all.deb ... 237s Unpacking autoconf (2.72-3) ... 237s Selecting previously unselected package autotools-dev. 237s Preparing to unpack .../04-autotools-dev_20220109.1_all.deb ... 237s Unpacking autotools-dev (20220109.1) ... 237s Selecting previously unselected package automake. 237s Preparing to unpack .../05-automake_1%3a1.17-3_all.deb ... 237s Unpacking automake (1:1.17-3) ... 237s Selecting previously unselected package autopoint. 237s Preparing to unpack .../06-autopoint_0.23.1-1_all.deb ... 237s Unpacking autopoint (0.23.1-1) ... 237s Selecting previously unselected package libisl23:amd64. 237s Preparing to unpack .../07-libisl23_0.27-1_amd64.deb ... 237s Unpacking libisl23:amd64 (0.27-1) ... 237s Selecting previously unselected package libmpc3:amd64. 237s Preparing to unpack .../08-libmpc3_1.3.1-1build2_amd64.deb ... 237s Unpacking libmpc3:amd64 (1.3.1-1build2) ... 237s Selecting previously unselected package cpp-14-x86-64-linux-gnu. 237s Preparing to unpack .../09-cpp-14-x86-64-linux-gnu_14.2.0-17ubuntu1_amd64.deb ... 237s Unpacking cpp-14-x86-64-linux-gnu (14.2.0-17ubuntu1) ... 237s Selecting previously unselected package cpp-14. 238s Preparing to unpack .../10-cpp-14_14.2.0-17ubuntu1_amd64.deb ... 238s Unpacking cpp-14 (14.2.0-17ubuntu1) ... 238s Selecting previously unselected package cpp-x86-64-linux-gnu. 238s Preparing to unpack .../11-cpp-x86-64-linux-gnu_4%3a14.2.0-1ubuntu1_amd64.deb ... 238s Unpacking cpp-x86-64-linux-gnu (4:14.2.0-1ubuntu1) ... 238s Selecting previously unselected package cpp. 238s Preparing to unpack .../12-cpp_4%3a14.2.0-1ubuntu1_amd64.deb ... 238s Unpacking cpp (4:14.2.0-1ubuntu1) ... 238s Selecting previously unselected package libcc1-0:amd64. 238s Preparing to unpack .../13-libcc1-0_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libcc1-0:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libgomp1:amd64. 238s Preparing to unpack .../14-libgomp1_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libgomp1:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libitm1:amd64. 238s Preparing to unpack .../15-libitm1_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libitm1:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libasan8:amd64. 238s Preparing to unpack .../16-libasan8_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libasan8:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package liblsan0:amd64. 238s Preparing to unpack .../17-liblsan0_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking liblsan0:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libtsan2:amd64. 238s Preparing to unpack .../18-libtsan2_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libtsan2:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libubsan1:amd64. 238s Preparing to unpack .../19-libubsan1_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libubsan1:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libhwasan0:amd64. 238s Preparing to unpack .../20-libhwasan0_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libhwasan0:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libquadmath0:amd64. 238s Preparing to unpack .../21-libquadmath0_15-20250213-1ubuntu1_amd64.deb ... 238s Unpacking libquadmath0:amd64 (15-20250213-1ubuntu1) ... 238s Selecting previously unselected package libgcc-14-dev:amd64. 238s Preparing to unpack .../22-libgcc-14-dev_14.2.0-17ubuntu1_amd64.deb ... 238s Unpacking libgcc-14-dev:amd64 (14.2.0-17ubuntu1) ... 238s Selecting previously unselected package gcc-14-x86-64-linux-gnu. 238s Preparing to unpack .../23-gcc-14-x86-64-linux-gnu_14.2.0-17ubuntu1_amd64.deb ... 238s Unpacking gcc-14-x86-64-linux-gnu (14.2.0-17ubuntu1) ... 239s Selecting previously unselected package gcc-14. 239s Preparing to unpack .../24-gcc-14_14.2.0-17ubuntu1_amd64.deb ... 239s Unpacking gcc-14 (14.2.0-17ubuntu1) ... 239s Selecting previously unselected package gcc-x86-64-linux-gnu. 239s Preparing to unpack .../25-gcc-x86-64-linux-gnu_4%3a14.2.0-1ubuntu1_amd64.deb ... 239s Unpacking gcc-x86-64-linux-gnu (4:14.2.0-1ubuntu1) ... 239s Selecting previously unselected package gcc. 239s Preparing to unpack .../26-gcc_4%3a14.2.0-1ubuntu1_amd64.deb ... 239s Unpacking gcc (4:14.2.0-1ubuntu1) ... 239s Selecting previously unselected package libstdc++-14-dev:amd64. 239s Preparing to unpack .../27-libstdc++-14-dev_14.2.0-17ubuntu1_amd64.deb ... 239s Unpacking libstdc++-14-dev:amd64 (14.2.0-17ubuntu1) ... 239s Selecting previously unselected package g++-14-x86-64-linux-gnu. 239s Preparing to unpack .../28-g++-14-x86-64-linux-gnu_14.2.0-17ubuntu1_amd64.deb ... 239s Unpacking g++-14-x86-64-linux-gnu (14.2.0-17ubuntu1) ... 239s Selecting previously unselected package g++-14. 239s Preparing to unpack .../29-g++-14_14.2.0-17ubuntu1_amd64.deb ... 239s Unpacking g++-14 (14.2.0-17ubuntu1) ... 239s Selecting previously unselected package g++-x86-64-linux-gnu. 239s Preparing to unpack .../30-g++-x86-64-linux-gnu_4%3a14.2.0-1ubuntu1_amd64.deb ... 239s Unpacking g++-x86-64-linux-gnu (4:14.2.0-1ubuntu1) ... 239s Selecting previously unselected package g++. 239s Preparing to unpack .../31-g++_4%3a14.2.0-1ubuntu1_amd64.deb ... 239s Unpacking g++ (4:14.2.0-1ubuntu1) ... 239s Selecting previously unselected package build-essential. 239s Preparing to unpack .../32-build-essential_12.10ubuntu1_amd64.deb ... 239s Unpacking build-essential (12.10ubuntu1) ... 239s Selecting previously unselected package libdebhelper-perl. 239s Preparing to unpack .../33-libdebhelper-perl_13.24.1ubuntu2_all.deb ... 239s Unpacking libdebhelper-perl (13.24.1ubuntu2) ... 239s Selecting previously unselected package libtool. 239s Preparing to unpack .../34-libtool_2.5.4-3build1_all.deb ... 239s Unpacking libtool (2.5.4-3build1) ... 239s Selecting previously unselected package dh-autoreconf. 239s Preparing to unpack .../35-dh-autoreconf_20_all.deb ... 239s Unpacking dh-autoreconf (20) ... 239s Selecting previously unselected package libarchive-zip-perl. 239s Preparing to unpack .../36-libarchive-zip-perl_1.68-1_all.deb ... 239s Unpacking libarchive-zip-perl (1.68-1) ... 239s Selecting previously unselected package libfile-stripnondeterminism-perl. 239s Preparing to unpack .../37-libfile-stripnondeterminism-perl_1.14.1-2_all.deb ... 239s Unpacking libfile-stripnondeterminism-perl (1.14.1-2) ... 239s Selecting previously unselected package dh-strip-nondeterminism. 239s Preparing to unpack .../38-dh-strip-nondeterminism_1.14.1-2_all.deb ... 239s Unpacking dh-strip-nondeterminism (1.14.1-2) ... 239s Selecting previously unselected package debugedit. 239s Preparing to unpack .../39-debugedit_1%3a5.1-2_amd64.deb ... 239s Unpacking debugedit (1:5.1-2) ... 239s Selecting previously unselected package dwz. 240s Preparing to unpack .../40-dwz_0.15-1build6_amd64.deb ... 240s Unpacking dwz (0.15-1build6) ... 240s Selecting previously unselected package gettext. 240s Preparing to unpack .../41-gettext_0.23.1-1_amd64.deb ... 240s Unpacking gettext (0.23.1-1) ... 240s Selecting previously unselected package intltool-debian. 240s Preparing to unpack .../42-intltool-debian_0.35.0+20060710.6_all.deb ... 240s Unpacking intltool-debian (0.35.0+20060710.6) ... 240s Selecting previously unselected package po-debconf. 240s Preparing to unpack .../43-po-debconf_1.0.21+nmu1_all.deb ... 240s Unpacking po-debconf (1.0.21+nmu1) ... 240s Selecting previously unselected package debhelper. 240s Preparing to unpack .../44-debhelper_13.24.1ubuntu2_all.deb ... 240s Unpacking debhelper (13.24.1ubuntu2) ... 240s Selecting previously unselected package dh-python. 240s Preparing to unpack .../45-dh-python_6.20250108_all.deb ... 240s Unpacking dh-python (6.20250108) ... 240s Selecting previously unselected package liberror-perl. 240s Preparing to unpack .../46-liberror-perl_0.17029-2_all.deb ... 240s Unpacking liberror-perl (0.17029-2) ... 240s Selecting previously unselected package git-man. 240s Preparing to unpack .../47-git-man_1%3a2.48.1-0ubuntu1_all.deb ... 240s Unpacking git-man (1:2.48.1-0ubuntu1) ... 240s Selecting previously unselected package git. 240s Preparing to unpack .../48-git_1%3a2.48.1-0ubuntu1_amd64.deb ... 240s Unpacking git (1:2.48.1-0ubuntu1) ... 240s Selecting previously unselected package git-revise. 240s Preparing to unpack .../49-git-revise_0.7.0-1_all.deb ... 240s Unpacking git-revise (0.7.0-1) ... 240s Selecting previously unselected package libexpat1-dev:amd64. 240s Preparing to unpack .../50-libexpat1-dev_2.6.4-1_amd64.deb ... 240s Unpacking libexpat1-dev:amd64 (2.6.4-1) ... 240s Selecting previously unselected package zlib1g-dev:amd64. 240s Preparing to unpack .../51-zlib1g-dev_1%3a1.3.dfsg+really1.3.1-1ubuntu1_amd64.deb ... 240s Unpacking zlib1g-dev:amd64 (1:1.3.dfsg+really1.3.1-1ubuntu1) ... 240s Selecting previously unselected package libpython3.13-dev:amd64. 240s Preparing to unpack .../52-libpython3.13-dev_3.13.2-1_amd64.deb ... 240s Unpacking libpython3.13-dev:amd64 (3.13.2-1) ... 241s Selecting previously unselected package libpython3-dev:amd64. 241s Preparing to unpack .../53-libpython3-dev_3.13.1-1~exp2_amd64.deb ... 241s Unpacking libpython3-dev:amd64 (3.13.1-1~exp2) ... 241s Selecting previously unselected package python3-mypy-extensions. 241s Preparing to unpack .../54-python3-mypy-extensions_1.0.0-1_all.deb ... 241s Unpacking python3-mypy-extensions (1.0.0-1) ... 241s Selecting previously unselected package python3-psutil. 241s Preparing to unpack .../55-python3-psutil_5.9.8-2build3_amd64.deb ... 241s Unpacking python3-psutil (5.9.8-2build3) ... 241s Selecting previously unselected package python3-mypy. 241s Preparing to unpack .../56-python3-mypy_1.15.0-2_amd64.deb ... 241s Unpacking python3-mypy (1.15.0-2) ... 241s Selecting previously unselected package mypy. 241s Preparing to unpack .../57-mypy_1.15.0-2_all.deb ... 241s Unpacking mypy (1.15.0-2) ... 241s Selecting previously unselected package pypy3-dev. 241s Preparing to unpack .../58-pypy3-dev_7.3.18+dfsg-2_all.deb ... 241s Unpacking pypy3-dev (7.3.18+dfsg-2) ... 241s Selecting previously unselected package python3-all. 241s Preparing to unpack .../59-python3-all_3.13.1-1~exp2_amd64.deb ... 241s Unpacking python3-all (3.13.1-1~exp2) ... 241s Selecting previously unselected package python3-iniconfig. 241s Preparing to unpack .../60-python3-iniconfig_1.1.1-2_all.deb ... 241s Unpacking python3-iniconfig (1.1.1-2) ... 241s Selecting previously unselected package python3-packaging. 241s Preparing to unpack .../61-python3-packaging_24.2-1_all.deb ... 241s Unpacking python3-packaging (24.2-1) ... 241s Selecting previously unselected package python3-pluggy. 241s Preparing to unpack .../62-python3-pluggy_1.5.0-1_all.deb ... 241s Unpacking python3-pluggy (1.5.0-1) ... 241s Selecting previously unselected package python3-pytest. 241s Preparing to unpack .../63-python3-pytest_8.3.4-1_all.deb ... 241s Unpacking python3-pytest (8.3.4-1) ... 241s Setting up dh-python (6.20250108) ... 242s Setting up python3-iniconfig (1.1.1-2) ... 242s Setting up python3.12-minimal (3.12.9-1) ... 243s Setting up libarchive-zip-perl (1.68-1) ... 243s Setting up python3-mypy-extensions (1.0.0-1) ... 243s Setting up libdebhelper-perl (13.24.1ubuntu2) ... 243s Setting up python3.12 (3.12.9-1) ... 245s Setting up m4 (1.4.19-5) ... 245s Setting up python3-all (3.13.1-1~exp2) ... 245s Setting up libgomp1:amd64 (15-20250213-1ubuntu1) ... 245s Setting up pypy3 (7.3.18+dfsg-2) ... 248s running pypy3 rtupdate hooks for 7.3 255s running pypy3 post-rtupdate hooks for 7.3 255s Setting up python3-psutil (5.9.8-2build3) ... 256s Setting up liberror-perl (0.17029-2) ... 256s Setting up autotools-dev (20220109.1) ... 256s Setting up python3-packaging (24.2-1) ... 256s Setting up libexpat1-dev:amd64 (2.6.4-1) ... 256s Setting up libquadmath0:amd64 (15-20250213-1ubuntu1) ... 256s Setting up libmpc3:amd64 (1.3.1-1build2) ... 256s Setting up python3-mypy (1.15.0-2) ... 260s Setting up autopoint (0.23.1-1) ... 260s Setting up pypy3-dev (7.3.18+dfsg-2) ... 260s Setting up autoconf (2.72-3) ... 260s Setting up python3-pluggy (1.5.0-1) ... 260s Setting up libubsan1:amd64 (15-20250213-1ubuntu1) ... 260s Setting up zlib1g-dev:amd64 (1:1.3.dfsg+really1.3.1-1ubuntu1) ... 260s Setting up dwz (0.15-1build6) ... 260s Setting up libhwasan0:amd64 (15-20250213-1ubuntu1) ... 260s Setting up libasan8:amd64 (15-20250213-1ubuntu1) ... 260s Setting up debugedit (1:5.1-2) ... 260s Setting up mypy (1.15.0-2) ... 260s Setting up git-man (1:2.48.1-0ubuntu1) ... 260s Setting up libtsan2:amd64 (15-20250213-1ubuntu1) ... 260s Setting up libisl23:amd64 (0.27-1) ... 260s Setting up libcc1-0:amd64 (15-20250213-1ubuntu1) ... 260s Setting up liblsan0:amd64 (15-20250213-1ubuntu1) ... 260s Setting up libitm1:amd64 (15-20250213-1ubuntu1) ... 260s Setting up automake (1:1.17-3) ... 260s update-alternatives: using /usr/bin/automake-1.17 to provide /usr/bin/automake (automake) in auto mode 260s Setting up libfile-stripnondeterminism-perl (1.14.1-2) ... 260s Setting up gettext (0.23.1-1) ... 260s Setting up python3-pytest (8.3.4-1) ... 261s Setting up intltool-debian (0.35.0+20060710.6) ... 261s Setting up libpython3.13-dev:amd64 (3.13.2-1) ... 261s Setting up cpp-14-x86-64-linux-gnu (14.2.0-17ubuntu1) ... 261s Setting up git (1:2.48.1-0ubuntu1) ... 261s Setting up cpp-14 (14.2.0-17ubuntu1) ... 261s Setting up dh-strip-nondeterminism (1.14.1-2) ... 261s Setting up git-revise (0.7.0-1) ... 262s Setting up libgcc-14-dev:amd64 (14.2.0-17ubuntu1) ... 262s Setting up libstdc++-14-dev:amd64 (14.2.0-17ubuntu1) ... 262s Setting up cpp-x86-64-linux-gnu (4:14.2.0-1ubuntu1) ... 262s Setting up libpython3-dev:amd64 (3.13.1-1~exp2) ... 262s Setting up po-debconf (1.0.21+nmu1) ... 262s Setting up cpp (4:14.2.0-1ubuntu1) ... 262s Setting up gcc-14-x86-64-linux-gnu (14.2.0-17ubuntu1) ... 262s Setting up gcc-x86-64-linux-gnu (4:14.2.0-1ubuntu1) ... 262s Setting up gcc-14 (14.2.0-17ubuntu1) ... 262s Setting up g++-14-x86-64-linux-gnu (14.2.0-17ubuntu1) ... 262s Setting up g++-x86-64-linux-gnu (4:14.2.0-1ubuntu1) ... 262s Setting up g++-14 (14.2.0-17ubuntu1) ... 262s Setting up libtool (2.5.4-3build1) ... 262s Setting up gcc (4:14.2.0-1ubuntu1) ... 262s Setting up dh-autoreconf (20) ... 262s Setting up g++ (4:14.2.0-1ubuntu1) ... 262s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 262s Setting up build-essential (12.10ubuntu1) ... 262s Setting up debhelper (13.24.1ubuntu2) ... 262s Processing triggers for man-db (2.13.0-1) ... 263s Processing triggers for install-info (7.1.1-1) ... 263s Processing triggers for libc-bin (2.40-4ubuntu1) ... 263s Processing triggers for systemd (257.2-3ubuntu1) ... 264s autopkgtest [04:24:59]: test command1: pytest-3 264s autopkgtest [04:24:59]: test command1: [----------------------- 265s ============================= test session starts ============================== 265s platform linux -- Python 3.13.2, pytest-8.3.4, pluggy-1.5.0 265s rootdir: /tmp/autopkgtest.20PueI/build.pcC/src 265s plugins: typeguard-4.4.1 265s collected 38 items 265s 266s tests/test_cut.py .. [ 5%] 268s tests/test_fixup.py .............. [ 42%] 269s tests/test_gpgsign.py . [ 44%] 273s tests/test_interactive.py .......... [ 71%] 286s tests/test_rerere.py FFF.. [ 84%] 287s tests/test_reword.py ...... [100%] 287s 287s =================================== FAILURES =================================== 287s ________________________ test_reuse_recorded_resolution ________________________ 287s 287s repo = 287s 287s def test_reuse_recorded_resolution(repo): 287s history_with_two_conflicting_commits(autoUpdate=True) 287s 287s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 287s flip_last_two_commits(repo, ed) 287s with ed.next_file() as f: 287s f.replace_dedent("resolved two\n") 287s with ed.next_file() as f: 287s f.replace_dedent("resolved one\n") 287s 287s tree_after_resolving_conflicts = repo.get_commit("HEAD").tree() 287s bash("git reset --hard HEAD@{1}") 287s 287s # Now we can change the order of the two commits and reuse the recorded conflict resolution. 287s with editor_main(("-i", "HEAD~~")) as ed: 287s flip_last_two_commits(repo, ed) 287s 287s assert tree_after_resolving_conflicts == repo.get_commit("HEAD").tree() 287s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 287s 287s /tmp/autopkgtest.20PueI/build.pcC/src/tests/test_rerere.py:39: 287s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 287s 287s diff = b'' 287s 287s def hunks(diff: bytes) -> bytes: 287s > return diff[diff.index(b"@@") :] 287s E ValueError: subsection not found 287s 287s /tmp/autopkgtest.20PueI/build.pcC/src/tests/test_rerere.py:370: ValueError 287s ----------------------------- Captured stdout call ----------------------------- 287s [master (root-commit) d72132e] initial commit 287s Author: Bash Author 287s 1 file changed, 1 insertion(+) 287s create mode 100644 file 287s [master 698fe81] commit one 287s Author: Bash Author 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s [master b1efb1b] commit two 287s Author: Bash Author 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 287s Conflict applying 'commit two' 287s Path: '/file' 287s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 287s pick e51ab202e87f commit two 287s Conflict applying 'commit one' 287s Path: '/file' 287s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 287s pick dc50430ecbd2 commit one 287s Updating refs/heads/master (b1efb1b8ffe680f67bd9e6824fcf0aa55d561139 => dc50430ecbd2d0697ee9266ba6057e0e0b511d7f) 287s HEAD is now at dc50430 commit one 287s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'check': True} 287s Conflict applying 'commit one' 287s Path: '/file' 287s Edit conflicted file? (Y/n) 287s ----------------------------- Captured stderr call ----------------------------- 287s 127.0.0.1 - - [19/Feb/2025 04:25:08] "POST / HTTP/1.1" 200 - 287s 127.0.0.1 - - [19/Feb/2025 04:25:08] "POST / HTTP/1.1" 200 - 287s 127.0.0.1 - - [19/Feb/2025 04:25:09] "POST / HTTP/1.1" 200 - 287s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 287s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 287s 127.0.0.1 - - [19/Feb/2025 04:25:09] "POST / HTTP/1.1" 200 - 287s Traceback (most recent call last): 287s File "", line 198, in _run_module_as_main 287s File "", line 88, in _run_code 287s File "/usr/lib/python3/dist-packages/gitrevise/__main__.py", line 4, in 287s main() 287s ~~~~^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 263, in main 287s inner_main(args, repo) 287s ~~~~~~~~~~^^^^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 254, in inner_main 287s interactive(args, repo, staged, head) 287s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 141, in interactive 287s new_head = apply_todos(base, todos, reauthor=args.reauthor) 287s File "/usr/lib/python3/dist-packages/gitrevise/todo.py", line 251, in apply_todos 287s rebased = step.commit.rebase(current).update(message=step.message) 287s ~~~~~~~~~~~~~~~~~~^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/odb.py", line 621, in rebase 287s return rebase(self, parent) 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 47, in rebase 287s tree = merge_trees( 287s Path("/"), 287s ...<3 lines>... 287s get_tree(commit), 287s ) 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 90, in merge_trees 287s merged = merge_entries( 287s path / name.decode(errors="replace"), 287s ...<3 lines>... 287s other.entries.get(name), 287s ) 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 165, in merge_entries 287s merge_blobs(path, labels, current.blob(), baseblob, other.blob()).oid, 287s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 235, in merge_blobs 287s if input(" Edit conflicted file? (Y/n) ").lower() == "n": 287s ~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s EOFError: EOF when reading a line 287s __________________________ test_rerere_no_autoupdate ___________________________ 287s 287s repo = 287s 287s def test_rerere_no_autoupdate(repo): 287s history_with_two_conflicting_commits(autoUpdate=False) 287s 287s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 287s flip_last_two_commits(repo, ed) 287s with ed.next_file() as f: 287s f.replace_dedent("resolved two\n") 287s with ed.next_file() as f: 287s f.replace_dedent("resolved one\n") 287s 287s tree_after_resolving_conflicts = repo.get_commit("HEAD").tree() 287s bash("git reset --hard HEAD@{1}") 287s 287s # Use the recorded resolution by confirming both times. 287s with editor_main(("-i", "HEAD~~"), input=b"y\ny\n") as ed: 287s flip_last_two_commits(repo, ed) 287s assert tree_after_resolving_conflicts == repo.get_commit("HEAD").tree() 287s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 287s 287s /tmp/autopkgtest.20PueI/build.pcC/src/tests/test_rerere.py:76: 287s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 287s 287s diff = b'' 287s 287s def hunks(diff: bytes) -> bytes: 287s > return diff[diff.index(b"@@") :] 287s E ValueError: subsection not found 287s 287s /tmp/autopkgtest.20PueI/build.pcC/src/tests/test_rerere.py:370: ValueError 287s ----------------------------- Captured stdout call ----------------------------- 287s [master (root-commit) d72132e] initial commit 287s Author: Bash Author 287s 1 file changed, 1 insertion(+) 287s create mode 100644 file 287s [master 698fe81] commit one 287s Author: Bash Author 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s [master b1efb1b] commit two 287s Author: Bash Author 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 287s Conflict applying 'commit two' 287s Path: '/file' 287s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 287s pick e51ab202e87f commit two 287s Conflict applying 'commit one' 287s Path: '/file' 287s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 287s pick dc50430ecbd2 commit one 287s Updating refs/heads/master (b1efb1b8ffe680f67bd9e6824fcf0aa55d561139 => dc50430ecbd2d0697ee9266ba6057e0e0b511d7f) 287s HEAD is now at dc50430 commit one 287s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\n', 'check': True} 287s Conflict applying 'commit one' 287s Path: '/file' 287s Edit conflicted file? (Y/n) editor error: Editor exited with status Command '['/bin/sh', '-ec', '/usr/bin/python3 /tmp/autopkgtest.20PueI/build.pcC/src/tests/dummy_editor.py http://127.0.0.1:33625/ "$@"', '/usr/bin/python3 /tmp/autopkgtest.20PueI/build.pcC/src/tests/dummy_editor.py http://127.0.0.1:33625/', 'file']' returned non-zero exit status 1. 287s ----------------------------- Captured stderr call ----------------------------- 287s 127.0.0.1 - - [19/Feb/2025 04:25:09] "POST / HTTP/1.1" 200 - 287s 127.0.0.1 - - [19/Feb/2025 04:25:09] "POST / HTTP/1.1" 200 - 287s 127.0.0.1 - - [19/Feb/2025 04:25:09] "POST / HTTP/1.1" 200 - 287s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 287s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 287s 127.0.0.1 - - [19/Feb/2025 04:25:09] "POST / HTTP/1.1" 200 - 287s Traceback (most recent call last): 287s File "/tmp/autopkgtest.20PueI/build.pcC/src/tests/dummy_editor.py", line 17, in 287s run_editor(url=sys.argv[1], path=Path(sys.argv[2]).resolve()) 287s ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s File "/tmp/autopkgtest.20PueI/build.pcC/src/tests/dummy_editor.py", line 8, in run_editor 287s with urlopen(url, data=path.read_bytes(), timeout=10) as r: 287s ~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s File "/usr/lib/python3.13/urllib/request.py", line 189, in urlopen 287s return opener.open(url, data, timeout) 287s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^ 287s File "/usr/lib/python3.13/urllib/request.py", line 489, in open 287s response = self._open(req, data) 287s File "/usr/lib/python3.13/urllib/request.py", line 506, in _open 287s result = self._call_chain(self.handle_open, protocol, protocol + 287s '_open', req) 287s File "/usr/lib/python3.13/urllib/request.py", line 466, in _call_chain 287s result = func(*args) 287s File "/usr/lib/python3.13/urllib/request.py", line 1348, in http_open 287s return self.do_open(http.client.HTTPConnection, req) 287s ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s File "/usr/lib/python3.13/urllib/request.py", line 1323, in do_open 287s r = h.getresponse() 287s File "/usr/lib/python3.13/http/client.py", line 1430, in getresponse 287s response.begin() 287s ~~~~~~~~~~~~~~^^ 287s File "/usr/lib/python3.13/http/client.py", line 331, in begin 287s version, status, reason = self._read_status() 287s ~~~~~~~~~~~~~~~~~^^ 287s File "/usr/lib/python3.13/http/client.py", line 292, in _read_status 287s line = str(self.fp.readline(_MAXLINE + 1), "iso-8859-1") 287s ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^ 287s File "/usr/lib/python3.13/socket.py", line 719, in readinto 287s return self._sock.recv_into(b) 287s ~~~~~~~~~~~~~~~~~~~~^^^ 287s TimeoutError: timed out 287s ______________________________ test_rerere_merge _______________________________ 287s 287s repo = 287s 287s def test_rerere_merge(repo): 287s (repo.workdir / "file").write_bytes(10 * b"x\n") 287s bash( 287s """ 287s git config rerere.enabled true 287s git config rerere.autoUpdate true 287s git add file; git commit -m 'initial commit' 287s """ 287s ) 287s changeline("file", 0, b"original1\n") 287s bash("git commit -am 'commit 1'") 287s changeline("file", 0, b"original2\n") 287s bash("git commit -am 'commit 2'") 287s 287s # Record a resolution for changing the order of two commits. 287s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 287s flip_last_two_commits(repo, ed) 287s with ed.next_file() as f: 287s f.replace_dedent(b"resolved1\n" + 9 * b"x\n") 287s with ed.next_file() as f: 287s f.replace_dedent(b"resolved2\n" + 9 * b"x\n") 287s # Go back to the old history so we can try replaying the resolution. 287s bash("git reset --hard HEAD@{1}") 287s 287s # Introduce an unrelated change that will not conflict to check that we can 287s # merge the file contents, and not just use the recorded postimage as is. 287s changeline("file", 9, b"unrelated change, present in all commits\n") 287s bash("git add file") 287s main(["HEAD~2"]) 287s 287s with editor_main(("-i", "HEAD~~")) as ed: 287s flip_last_two_commits(repo, ed) 287s 287s assert hunks(repo.git("show", "-U0", "HEAD~")) == dedent( 287s """\ 287s @@ -1 +1 @@ 287s -x 287s +resolved1""" 287s ) 287s assert hunks(repo.git("show", "-U0", "HEAD")) == dedent( 287s """\ 287s @@ -1 +1 @@ 287s -resolved1 287s +resolved2""" 287s ) 287s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 287s 287s /tmp/autopkgtest.20PueI/build.pcC/src/tests/test_rerere.py:144: 287s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 287s 287s diff = b'' 287s 287s def hunks(diff: bytes) -> bytes: 287s > return diff[diff.index(b"@@") :] 287s E ValueError: subsection not found 287s 287s /tmp/autopkgtest.20PueI/build.pcC/src/tests/test_rerere.py:370: ValueError 287s ----------------------------- Captured stdout call ----------------------------- 287s [master (root-commit) 78ab633] initial commit 287s Author: Bash Author 287s 1 file changed, 10 insertions(+) 287s create mode 100644 file 287s [master bc4398a] commit 1 287s Author: Bash Author 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s [master 8ede3c3] commit 2 287s Author: Bash Author 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 287s Conflict applying 'commit 2' 287s Path: '/file' 287s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 287s pick 8d5d4e07cf09 commit 2 287s Conflict applying 'commit 1' 287s Path: '/file' 287s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 287s pick 4afa53fa2fa8 commit 1 287s Updating refs/heads/master (8ede3c350c17709e6a2b5f4775e4a12770b88dc1 => 4afa53fa2fa843a3a089d55050139011198ab3d0) 287s HEAD is now at 4afa53f commit 1 287s Running ['/usr/bin/python3', '-m', 'gitrevise', 'HEAD~2'] {'check': True} 287s Applying staged changes to 'HEAD~2' 287s 035bca1522bd initial commit 287s 712c4d25b5e2 commit 2 287s 33e258e25f6a commit 1 287s Updating refs/heads/master (4afa53fa2fa843a3a089d55050139011198ab3d0 => 33e258e25f6a8d5629beb2c02cb1b7e388b61791) 287s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'check': True} 287s Conflict applying 'commit 1' 287s Path: '/file' 287s Edit conflicted file? (Y/n) 287s ----------------------------- Captured stderr call ----------------------------- 287s 127.0.0.1 - - [19/Feb/2025 04:25:20] "POST / HTTP/1.1" 200 - 287s 127.0.0.1 - - [19/Feb/2025 04:25:20] "POST / HTTP/1.1" 200 - 287s 127.0.0.1 - - [19/Feb/2025 04:25:20] "POST / HTTP/1.1" 200 - 287s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 287s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 287s 127.0.0.1 - - [19/Feb/2025 04:25:20] "POST / HTTP/1.1" 200 - 287s Traceback (most recent call last): 287s File "", line 198, in _run_module_as_main 287s File "", line 88, in _run_code 287s File "/usr/lib/python3/dist-packages/gitrevise/__main__.py", line 4, in 287s main() 287s ~~~~^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 263, in main 287s inner_main(args, repo) 287s ~~~~~~~~~~^^^^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 254, in inner_main 287s interactive(args, repo, staged, head) 287s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 141, in interactive 287s new_head = apply_todos(base, todos, reauthor=args.reauthor) 287s File "/usr/lib/python3/dist-packages/gitrevise/todo.py", line 251, in apply_todos 287s rebased = step.commit.rebase(current).update(message=step.message) 287s ~~~~~~~~~~~~~~~~~~^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/odb.py", line 621, in rebase 287s return rebase(self, parent) 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 47, in rebase 287s tree = merge_trees( 287s Path("/"), 287s ...<3 lines>... 287s get_tree(commit), 287s ) 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 90, in merge_trees 287s merged = merge_entries( 287s path / name.decode(errors="replace"), 287s ...<3 lines>... 287s other.entries.get(name), 287s ) 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 165, in merge_entries 287s merge_blobs(path, labels, current.blob(), baseblob, other.blob()).oid, 287s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 235, in merge_blobs 287s if input(" Edit conflicted file? (Y/n) ").lower() == "n": 287s ~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 287s EOFError: EOF when reading a line 287s =========================== short test summary info ============================ 287s FAILED tests/test_rerere.py::test_reuse_recorded_resolution - ValueError: sub... 287s FAILED tests/test_rerere.py::test_rerere_no_autoupdate - ValueError: subsecti... 287s FAILED tests/test_rerere.py::test_rerere_merge - ValueError: subsection not f... 287s ======================== 3 failed, 35 passed in 21.83s ========================= 287s autopkgtest [04:25:22]: test command1: -----------------------] 288s command1 FAIL non-zero exit status 1 288s autopkgtest [04:25:23]: test command1: - - - - - - - - - - results - - - - - - - - - - 288s autopkgtest [04:25:23]: @@@@@@@@@@@@@@@@@@@@ summary 288s command1 FAIL non-zero exit status 1 451s nova [W] Skipping flock for amd64 451s Creating nova instance adt-plucky-amd64-git-revise-20250219-042035-juju-7f2275-prod-proposed-migration-environment-15-8384f3cc-1978-44bf-a3e5-7f40a1db5adf from image adt/ubuntu-plucky-amd64-server-20250219.img (UUID 90711abf-916f-4a80-845a-825250a78697)... 451s nova [W] Timed out waiting for 0057b603-8822-4f24-8cc3-f5d54c68c264 to get deleted.