0s autopkgtest [07:24:30]: starting date and time: 2025-02-19 07:24:30+0000 0s autopkgtest [07:24:30]: git checkout: 325255d2 Merge branch 'pin-any-arch' into 'ubuntu/production' 0s autopkgtest [07:24:30]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.q_ywqimo/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-ppc64el --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@bos03-ppc64el-15.secgroup --name adt-plucky-ppc64el-git-revise-20250219-072430-juju-7f2275-prod-proposed-migration-environment-15-9e3c10c1-e42b-4e94-b0f4-71ae01c34219 --image adt/ubuntu-plucky-ppc64el-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-proposed-migration-ppc64el -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/ 121s autopkgtest [07:26:31]: testbed dpkg architecture: ppc64el 121s autopkgtest [07:26:31]: testbed apt version: 2.9.29 121s autopkgtest [07:26:31]: @@@@@@@@@@@@@@@@@@@@ test bed setup 122s autopkgtest [07:26:32]: testbed release detected to be: None 122s autopkgtest [07:26:32]: updating testbed package index (apt update) 123s Get:1 http://ftpmaster.internal/ubuntu plucky-proposed InRelease [110 kB] 123s Hit:2 http://ftpmaster.internal/ubuntu plucky InRelease 123s Hit:3 http://ftpmaster.internal/ubuntu plucky-updates InRelease 123s Hit:4 http://ftpmaster.internal/ubuntu plucky-security InRelease 123s Get:5 http://ftpmaster.internal/ubuntu plucky-proposed/main Sources [73.3 kB] 123s Get:6 http://ftpmaster.internal/ubuntu plucky-proposed/restricted Sources [3120 B] 123s Get:7 http://ftpmaster.internal/ubuntu plucky-proposed/multiverse Sources [14.6 kB] 123s Get:8 http://ftpmaster.internal/ubuntu plucky-proposed/universe Sources [734 kB] 123s Get:9 http://ftpmaster.internal/ubuntu plucky-proposed/main ppc64el Packages [91.9 kB] 123s Get:10 http://ftpmaster.internal/ubuntu plucky-proposed/restricted ppc64el Packages [760 B] 123s Get:11 http://ftpmaster.internal/ubuntu plucky-proposed/universe ppc64el Packages [638 kB] 123s Get:12 http://ftpmaster.internal/ubuntu plucky-proposed/multiverse ppc64el Packages [6324 B] 124s Fetched 1673 kB in 1s (1681 kB/s) 125s Reading package lists... 125s + lsb_release --codename --short 125s + RELEASE=plucky 125s + cat 125s + [ plucky != trusty ] 125s + DEBIAN_FRONTEND=noninteractive eatmydata apt-get -y --allow-downgrades -o Dpkg::Options::=--force-confnew dist-upgrade 125s Reading package lists... 126s Building dependency tree... 126s Reading state information... 126s Calculating upgrade... 126s The following NEW packages will be installed: 126s libapt-pkg7.0 126s The following packages will be upgraded: 126s apt apt-utils dhcpcd-base rsyslog 127s 4 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. 127s Need to get 3731 kB of archives. 127s After this operation, 3926 kB of additional disk space will be used. 127s Get:1 http://ftpmaster.internal/ubuntu plucky/main ppc64el libapt-pkg7.0 ppc64el 2.9.30 [1152 kB] 127s Get:2 http://ftpmaster.internal/ubuntu plucky/main ppc64el apt ppc64el 2.9.30 [1439 kB] 127s Get:3 http://ftpmaster.internal/ubuntu plucky/main ppc64el apt-utils ppc64el 2.9.30 [228 kB] 127s Get:4 http://ftpmaster.internal/ubuntu plucky/main ppc64el dhcpcd-base ppc64el 1:10.1.0-7 [280 kB] 127s Get:5 http://ftpmaster.internal/ubuntu plucky/main ppc64el rsyslog ppc64el 8.2412.0-2ubuntu1 [632 kB] 128s Fetched 3731 kB in 1s (4973 kB/s) 128s Selecting previously unselected package libapt-pkg7.0:ppc64el. 128s (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 ... 106322 files and directories currently installed.) 128s Preparing to unpack .../libapt-pkg7.0_2.9.30_ppc64el.deb ... 128s Unpacking libapt-pkg7.0:ppc64el (2.9.30) ... 128s Setting up libapt-pkg7.0:ppc64el (2.9.30) ... 128s (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 ... 106371 files and directories currently installed.) 128s Preparing to unpack .../apt_2.9.30_ppc64el.deb ... 129s Unpacking apt (2.9.30) over (2.9.29) ... 129s Setting up apt (2.9.30) ... 130s (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 ... 106371 files and directories currently installed.) 130s Preparing to unpack .../apt-utils_2.9.30_ppc64el.deb ... 130s Unpacking apt-utils (2.9.30) over (2.9.29) ... 130s Preparing to unpack .../dhcpcd-base_1%3a10.1.0-7_ppc64el.deb ... 130s Unpacking dhcpcd-base (1:10.1.0-7) over (1:10.1.0-6) ... 130s Preparing to unpack .../rsyslog_8.2412.0-2ubuntu1_ppc64el.deb ... 130s Unpacking rsyslog (8.2412.0-2ubuntu1) over (8.2412.0-1ubuntu1) ... 130s Setting up apt-utils (2.9.30) ... 130s Setting up rsyslog (8.2412.0-2ubuntu1) ... 130s info: The user `syslog' is already a member of `adm'. 132s Setting up dhcpcd-base (1:10.1.0-7) ... 132s Processing triggers for man-db (2.13.0-1) ... 135s Processing triggers for libc-bin (2.40-4ubuntu1) ... 135s + rm /etc/apt/preferences.d/force-downgrade-to-release.pref 135s + /usr/lib/apt/apt-helper analyze-pattern ?true 135s + + sed s/\./\\./g 135s uname -r 135s + running_kernel_pattern=^linux-.*6\.12\.0-15-generic.* 135s + apt list ?obsolete 135s + tail -n+2 135s + cut -d/ -f1 135s + grep -v ^linux-.*6\.12\.0-15-generic.* 137s + true 137s + obsolete_pkgs= 137s + DEBIAN_FRONTEND=noninteractive eatmydata apt-get -y purge --autoremove 137s Reading package lists... 137s Building dependency tree... 137s Reading state information... 137s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 137s + grep -q trusty /etc/lsb-release 137s + [ ! -d /usr/share/doc/unattended-upgrades ] 137s + [ ! -d /usr/share/doc/lxd ] 137s + [ ! -d /usr/share/doc/lxd-client ] 137s + [ ! -d /usr/share/doc/snapd ] 137s + type iptables 137s + cat 137s + chmod 755 /etc/rc.local 137s + . /etc/rc.local 137s + iptables -w -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu 137s + iptables -A OUTPUT -d 10.255.255.1/32 -p tcp -j DROP 137s + iptables -A OUTPUT -d 10.255.255.2/32 -p tcp -j DROP 137s + uname -m 137s + [ ppc64le = ppc64le ] 137s + systemctl is-active keyboard-setup.service 137s + [ active = failed ] 137s + [ -d /run/systemd/system ] 137s + systemd-detect-virt --quiet --vm 137s + mkdir -p /etc/systemd/system/systemd-random-seed.service.d/ 137s + cat 137s + grep -q lz4 /etc/initramfs-tools/initramfs.conf 137s + echo COMPRESS=lz4 137s autopkgtest [07:26:47]: upgrading testbed (apt dist-upgrade and autopurge) 137s Reading package lists... 138s Building dependency tree... 138s Reading state information... 138s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 138s Starting 2 pkgProblemResolver with broken count: 0 138s Done 138s Entering ResolveByKeep 138s 139s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 139s Reading package lists... 139s Building dependency tree... 139s Reading state information... 139s Starting pkgProblemResolver with broken count: 0 139s Starting 2 pkgProblemResolver with broken count: 0 139s Done 140s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 140s autopkgtest [07:26:50]: rebooting testbed after setup commands that affected boot 174s autopkgtest-virt-ssh: WARNING: ssh connection failed. Retrying in 3 seconds... 190s autopkgtest [07:27:40]: testbed running kernel: Linux 6.12.0-15-generic #15-Ubuntu SMP Tue Feb 4 16:32:08 UTC 2025 192s autopkgtest [07:27:42]: @@@@@@@@@@@@@@@@@@@@ apt-source git-revise 194s Get:1 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (dsc) [1879 B] 194s Get:2 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (tar) [35.6 kB] 194s Get:3 http://ftpmaster.internal/ubuntu plucky/universe git-revise 0.7.0-1 (diff) [3456 B] 195s gpgv: Signature made Wed Mar 30 16:15:29 2022 UTC 195s gpgv: using RSA key 406220C8B8552802378CCE411F5C7A8B45564314 195s gpgv: issuer "bage@debian.org" 195s gpgv: Can't check signature: No public key 195s dpkg-source: warning: cannot verify inline signature for ./git-revise_0.7.0-1.dsc: no acceptable signature found 195s autopkgtest [07:27:45]: testing package git-revise version 0.7.0-1 195s autopkgtest [07:27:45]: build not needed 195s autopkgtest [07:27:45]: test command1: preparing testbed 196s Reading package lists... 196s Building dependency tree... 196s Reading state information... 196s Starting pkgProblemResolver with broken count: 0 196s Starting 2 pkgProblemResolver with broken count: 0 196s Done 197s The following NEW packages will be installed: 197s autoconf automake autopoint autotools-dev build-essential cpp cpp-14 197s cpp-14-powerpc64le-linux-gnu cpp-powerpc64le-linux-gnu debhelper debugedit 197s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-14 197s g++-14-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu gcc gcc-14 197s gcc-14-powerpc64le-linux-gnu gcc-powerpc64le-linux-gnu gettext git git-man 197s git-revise intltool-debian libarchive-zip-perl libasan8 libcc1-0 197s libdebhelper-perl liberror-perl libexpat1-dev 197s libfile-stripnondeterminism-perl libgcc-14-dev libgomp1 libisl23 libitm1 197s liblsan0 libmpc3 libpython3-dev libpython3.13-dev libquadmath0 197s libstdc++-14-dev libtool libtsan2 libubsan1 m4 mypy po-debconf pypy3 197s pypy3-dev pypy3-lib python3-all python3-iniconfig python3-mypy 197s python3-mypy-extensions python3-packaging python3-pluggy python3-psutil 197s python3-pytest python3.12 python3.12-minimal zlib1g-dev 197s 0 upgraded, 65 newly installed, 0 to remove and 0 not upgraded. 197s Need to get 111 MB of archives. 197s After this operation, 496 MB of additional disk space will be used. 197s Get:1 http://ftpmaster.internal/ubuntu plucky/main ppc64el python3.12-minimal ppc64el 3.12.9-1 [2465 kB] 198s Get:2 http://ftpmaster.internal/ubuntu plucky/universe ppc64el pypy3-lib ppc64el 7.3.18+dfsg-2 [2872 kB] 198s Get:3 http://ftpmaster.internal/ubuntu plucky/universe ppc64el pypy3 ppc64el 7.3.18+dfsg-2 [11.3 MB] 198s Get:4 http://ftpmaster.internal/ubuntu plucky/main ppc64el python3.12 ppc64el 3.12.9-1 [671 kB] 198s Get:5 http://ftpmaster.internal/ubuntu plucky/main ppc64el m4 ppc64el 1.4.19-5 [280 kB] 198s Get:6 http://ftpmaster.internal/ubuntu plucky/main ppc64el autoconf all 2.72-3 [382 kB] 198s Get:7 http://ftpmaster.internal/ubuntu plucky/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 198s Get:8 http://ftpmaster.internal/ubuntu plucky/main ppc64el automake all 1:1.17-3 [572 kB] 198s Get:9 http://ftpmaster.internal/ubuntu plucky/main ppc64el autopoint all 0.23.1-1 [619 kB] 198s Get:10 http://ftpmaster.internal/ubuntu plucky/main ppc64el libisl23 ppc64el 0.27-1 [882 kB] 198s Get:11 http://ftpmaster.internal/ubuntu plucky/main ppc64el libmpc3 ppc64el 1.3.1-1build2 [62.1 kB] 198s Get:12 http://ftpmaster.internal/ubuntu plucky/main ppc64el cpp-14-powerpc64le-linux-gnu ppc64el 14.2.0-17ubuntu1 [10.5 MB] 198s Get:13 http://ftpmaster.internal/ubuntu plucky/main ppc64el cpp-14 ppc64el 14.2.0-17ubuntu1 [1038 B] 198s Get:14 http://ftpmaster.internal/ubuntu plucky/main ppc64el cpp-powerpc64le-linux-gnu ppc64el 4:14.2.0-1ubuntu1 [5566 B] 198s Get:15 http://ftpmaster.internal/ubuntu plucky/main ppc64el cpp ppc64el 4:14.2.0-1ubuntu1 [22.4 kB] 198s Get:16 http://ftpmaster.internal/ubuntu plucky/main ppc64el libcc1-0 ppc64el 15-20250213-1ubuntu1 [48.7 kB] 198s Get:17 http://ftpmaster.internal/ubuntu plucky/main ppc64el libgomp1 ppc64el 15-20250213-1ubuntu1 [168 kB] 198s Get:18 http://ftpmaster.internal/ubuntu plucky/main ppc64el libitm1 ppc64el 15-20250213-1ubuntu1 [32.4 kB] 198s Get:19 http://ftpmaster.internal/ubuntu plucky/main ppc64el libasan8 ppc64el 15-20250213-1ubuntu1 [3009 kB] 198s Get:20 http://ftpmaster.internal/ubuntu plucky/main ppc64el liblsan0 ppc64el 15-20250213-1ubuntu1 [1377 kB] 198s Get:21 http://ftpmaster.internal/ubuntu plucky/main ppc64el libtsan2 ppc64el 15-20250213-1ubuntu1 [2734 kB] 199s Get:22 http://ftpmaster.internal/ubuntu plucky/main ppc64el libubsan1 ppc64el 15-20250213-1ubuntu1 [1234 kB] 199s Get:23 http://ftpmaster.internal/ubuntu plucky/main ppc64el libquadmath0 ppc64el 15-20250213-1ubuntu1 [160 kB] 199s Get:24 http://ftpmaster.internal/ubuntu plucky/main ppc64el libgcc-14-dev ppc64el 14.2.0-17ubuntu1 [1620 kB] 199s Get:25 http://ftpmaster.internal/ubuntu plucky/main ppc64el gcc-14-powerpc64le-linux-gnu ppc64el 14.2.0-17ubuntu1 [20.6 MB] 199s Get:26 http://ftpmaster.internal/ubuntu plucky/main ppc64el gcc-14 ppc64el 14.2.0-17ubuntu1 [536 kB] 199s Get:27 http://ftpmaster.internal/ubuntu plucky/main ppc64el gcc-powerpc64le-linux-gnu ppc64el 4:14.2.0-1ubuntu1 [1226 B] 199s Get:28 http://ftpmaster.internal/ubuntu plucky/main ppc64el gcc ppc64el 4:14.2.0-1ubuntu1 [5012 B] 199s Get:29 http://ftpmaster.internal/ubuntu plucky/main ppc64el libstdc++-14-dev ppc64el 14.2.0-17ubuntu1 [2677 kB] 199s Get:30 http://ftpmaster.internal/ubuntu plucky/main ppc64el g++-14-powerpc64le-linux-gnu ppc64el 14.2.0-17ubuntu1 [12.0 MB] 199s Get:31 http://ftpmaster.internal/ubuntu plucky/main ppc64el g++-14 ppc64el 14.2.0-17ubuntu1 [21.8 kB] 199s Get:32 http://ftpmaster.internal/ubuntu plucky/main ppc64el g++-powerpc64le-linux-gnu ppc64el 4:14.2.0-1ubuntu1 [966 B] 199s Get:33 http://ftpmaster.internal/ubuntu plucky/main ppc64el g++ ppc64el 4:14.2.0-1ubuntu1 [1088 B] 199s Get:34 http://ftpmaster.internal/ubuntu plucky/main ppc64el build-essential ppc64el 12.10ubuntu1 [4936 B] 199s Get:35 http://ftpmaster.internal/ubuntu plucky/main ppc64el libdebhelper-perl all 13.24.1ubuntu2 [95.4 kB] 199s Get:36 http://ftpmaster.internal/ubuntu plucky/main ppc64el libtool all 2.5.4-3build1 [168 kB] 199s Get:37 http://ftpmaster.internal/ubuntu plucky/main ppc64el dh-autoreconf all 20 [16.1 kB] 199s Get:38 http://ftpmaster.internal/ubuntu plucky/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 199s Get:39 http://ftpmaster.internal/ubuntu plucky/main ppc64el libfile-stripnondeterminism-perl all 1.14.1-2 [20.3 kB] 200s Get:40 http://ftpmaster.internal/ubuntu plucky/main ppc64el dh-strip-nondeterminism all 1.14.1-2 [5064 B] 200s Get:41 http://ftpmaster.internal/ubuntu plucky/main ppc64el debugedit ppc64el 1:5.1-2 [52.4 kB] 200s Get:42 http://ftpmaster.internal/ubuntu plucky/main ppc64el dwz ppc64el 0.15-1build6 [142 kB] 200s Get:43 http://ftpmaster.internal/ubuntu plucky/main ppc64el gettext ppc64el 0.23.1-1 [1155 kB] 200s Get:44 http://ftpmaster.internal/ubuntu plucky/main ppc64el intltool-debian all 0.35.0+20060710.6 [23.2 kB] 200s Get:45 http://ftpmaster.internal/ubuntu plucky/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 200s Get:46 http://ftpmaster.internal/ubuntu plucky/main ppc64el debhelper all 13.24.1ubuntu2 [895 kB] 200s Get:47 http://ftpmaster.internal/ubuntu plucky/universe ppc64el dh-python all 6.20250108 [117 kB] 200s Get:48 http://ftpmaster.internal/ubuntu plucky/main ppc64el liberror-perl all 0.17029-2 [25.6 kB] 200s Get:49 http://ftpmaster.internal/ubuntu plucky-proposed/main ppc64el git-man all 1:2.48.1-0ubuntu1 [1148 kB] 200s Get:50 http://ftpmaster.internal/ubuntu plucky-proposed/main ppc64el git ppc64el 1:2.48.1-0ubuntu1 [7338 kB] 200s Get:51 http://ftpmaster.internal/ubuntu plucky/universe ppc64el git-revise all 0.7.0-1 [31.7 kB] 200s Get:52 http://ftpmaster.internal/ubuntu plucky/main ppc64el libexpat1-dev ppc64el 2.6.4-1 [149 kB] 200s Get:53 http://ftpmaster.internal/ubuntu plucky/main ppc64el zlib1g-dev ppc64el 1:1.3.dfsg+really1.3.1-1ubuntu1 [902 kB] 200s Get:54 http://ftpmaster.internal/ubuntu plucky/main ppc64el libpython3.13-dev ppc64el 3.13.2-1 [5971 kB] 200s Get:55 http://ftpmaster.internal/ubuntu plucky/main ppc64el libpython3-dev ppc64el 3.13.1-1~exp2 [10.5 kB] 200s Get:56 http://ftpmaster.internal/ubuntu plucky/universe ppc64el python3-mypy-extensions all 1.0.0-1 [6148 B] 200s Get:57 http://ftpmaster.internal/ubuntu plucky/main ppc64el python3-psutil ppc64el 5.9.8-2build3 [197 kB] 200s Get:58 http://ftpmaster.internal/ubuntu plucky/universe ppc64el python3-mypy ppc64el 1.15.0-2 [15.2 MB] 201s Get:59 http://ftpmaster.internal/ubuntu plucky/universe ppc64el mypy all 1.15.0-2 [25.4 kB] 201s Get:60 http://ftpmaster.internal/ubuntu plucky/universe ppc64el pypy3-dev all 7.3.18+dfsg-2 [79.9 kB] 201s Get:61 http://ftpmaster.internal/ubuntu plucky/main ppc64el python3-all ppc64el 3.13.1-1~exp2 [896 B] 201s Get:62 http://ftpmaster.internal/ubuntu plucky/universe ppc64el python3-iniconfig all 1.1.1-2 [6024 B] 201s Get:63 http://ftpmaster.internal/ubuntu plucky/main ppc64el python3-packaging all 24.2-1 [51.5 kB] 201s Get:64 http://ftpmaster.internal/ubuntu plucky/universe ppc64el python3-pluggy all 1.5.0-1 [21.0 kB] 201s Get:65 http://ftpmaster.internal/ubuntu plucky/universe ppc64el python3-pytest all 8.3.4-1 [252 kB] 202s Fetched 111 MB in 4s (28.0 MB/s) 202s Selecting previously unselected package python3.12-minimal. 202s (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 ... 106371 files and directories currently installed.) 202s Preparing to unpack .../python3.12-minimal_3.12.9-1_ppc64el.deb ... 202s Unpacking python3.12-minimal (3.12.9-1) ... 202s Selecting previously unselected package pypy3-lib:ppc64el. 202s Preparing to unpack .../pypy3-lib_7.3.18+dfsg-2_ppc64el.deb ... 202s Unpacking pypy3-lib:ppc64el (7.3.18+dfsg-2) ... 202s Setting up pypy3-lib:ppc64el (7.3.18+dfsg-2) ... 202s Selecting previously unselected package pypy3. 202s (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 ... 107631 files and directories currently installed.) 202s Preparing to unpack .../00-pypy3_7.3.18+dfsg-2_ppc64el.deb ... 202s Unpacking pypy3 (7.3.18+dfsg-2) ... 203s Selecting previously unselected package python3.12. 203s Preparing to unpack .../01-python3.12_3.12.9-1_ppc64el.deb ... 203s Unpacking python3.12 (3.12.9-1) ... 203s Selecting previously unselected package m4. 203s Preparing to unpack .../02-m4_1.4.19-5_ppc64el.deb ... 203s Unpacking m4 (1.4.19-5) ... 203s Selecting previously unselected package autoconf. 203s Preparing to unpack .../03-autoconf_2.72-3_all.deb ... 203s Unpacking autoconf (2.72-3) ... 203s Selecting previously unselected package autotools-dev. 203s Preparing to unpack .../04-autotools-dev_20220109.1_all.deb ... 203s Unpacking autotools-dev (20220109.1) ... 203s Selecting previously unselected package automake. 203s Preparing to unpack .../05-automake_1%3a1.17-3_all.deb ... 203s Unpacking automake (1:1.17-3) ... 203s Selecting previously unselected package autopoint. 203s Preparing to unpack .../06-autopoint_0.23.1-1_all.deb ... 203s Unpacking autopoint (0.23.1-1) ... 203s Selecting previously unselected package libisl23:ppc64el. 203s Preparing to unpack .../07-libisl23_0.27-1_ppc64el.deb ... 203s Unpacking libisl23:ppc64el (0.27-1) ... 203s Selecting previously unselected package libmpc3:ppc64el. 203s Preparing to unpack .../08-libmpc3_1.3.1-1build2_ppc64el.deb ... 203s Unpacking libmpc3:ppc64el (1.3.1-1build2) ... 203s Selecting previously unselected package cpp-14-powerpc64le-linux-gnu. 203s Preparing to unpack .../09-cpp-14-powerpc64le-linux-gnu_14.2.0-17ubuntu1_ppc64el.deb ... 203s Unpacking cpp-14-powerpc64le-linux-gnu (14.2.0-17ubuntu1) ... 203s Selecting previously unselected package cpp-14. 203s Preparing to unpack .../10-cpp-14_14.2.0-17ubuntu1_ppc64el.deb ... 203s Unpacking cpp-14 (14.2.0-17ubuntu1) ... 204s Selecting previously unselected package cpp-powerpc64le-linux-gnu. 204s Preparing to unpack .../11-cpp-powerpc64le-linux-gnu_4%3a14.2.0-1ubuntu1_ppc64el.deb ... 204s Unpacking cpp-powerpc64le-linux-gnu (4:14.2.0-1ubuntu1) ... 204s Selecting previously unselected package cpp. 204s Preparing to unpack .../12-cpp_4%3a14.2.0-1ubuntu1_ppc64el.deb ... 204s Unpacking cpp (4:14.2.0-1ubuntu1) ... 204s Selecting previously unselected package libcc1-0:ppc64el. 204s Preparing to unpack .../13-libcc1-0_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking libcc1-0:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package libgomp1:ppc64el. 204s Preparing to unpack .../14-libgomp1_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking libgomp1:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package libitm1:ppc64el. 204s Preparing to unpack .../15-libitm1_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking libitm1:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package libasan8:ppc64el. 204s Preparing to unpack .../16-libasan8_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking libasan8:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package liblsan0:ppc64el. 204s Preparing to unpack .../17-liblsan0_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking liblsan0:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package libtsan2:ppc64el. 204s Preparing to unpack .../18-libtsan2_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking libtsan2:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package libubsan1:ppc64el. 204s Preparing to unpack .../19-libubsan1_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking libubsan1:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package libquadmath0:ppc64el. 204s Preparing to unpack .../20-libquadmath0_15-20250213-1ubuntu1_ppc64el.deb ... 204s Unpacking libquadmath0:ppc64el (15-20250213-1ubuntu1) ... 204s Selecting previously unselected package libgcc-14-dev:ppc64el. 204s Preparing to unpack .../21-libgcc-14-dev_14.2.0-17ubuntu1_ppc64el.deb ... 204s Unpacking libgcc-14-dev:ppc64el (14.2.0-17ubuntu1) ... 204s Selecting previously unselected package gcc-14-powerpc64le-linux-gnu. 204s Preparing to unpack .../22-gcc-14-powerpc64le-linux-gnu_14.2.0-17ubuntu1_ppc64el.deb ... 204s Unpacking gcc-14-powerpc64le-linux-gnu (14.2.0-17ubuntu1) ... 205s Selecting previously unselected package gcc-14. 205s Preparing to unpack .../23-gcc-14_14.2.0-17ubuntu1_ppc64el.deb ... 205s Unpacking gcc-14 (14.2.0-17ubuntu1) ... 205s Selecting previously unselected package gcc-powerpc64le-linux-gnu. 205s Preparing to unpack .../24-gcc-powerpc64le-linux-gnu_4%3a14.2.0-1ubuntu1_ppc64el.deb ... 205s Unpacking gcc-powerpc64le-linux-gnu (4:14.2.0-1ubuntu1) ... 205s Selecting previously unselected package gcc. 205s Preparing to unpack .../25-gcc_4%3a14.2.0-1ubuntu1_ppc64el.deb ... 205s Unpacking gcc (4:14.2.0-1ubuntu1) ... 205s Selecting previously unselected package libstdc++-14-dev:ppc64el. 205s Preparing to unpack .../26-libstdc++-14-dev_14.2.0-17ubuntu1_ppc64el.deb ... 205s Unpacking libstdc++-14-dev:ppc64el (14.2.0-17ubuntu1) ... 205s Selecting previously unselected package g++-14-powerpc64le-linux-gnu. 205s Preparing to unpack .../27-g++-14-powerpc64le-linux-gnu_14.2.0-17ubuntu1_ppc64el.deb ... 205s Unpacking g++-14-powerpc64le-linux-gnu (14.2.0-17ubuntu1) ... 206s Selecting previously unselected package g++-14. 206s Preparing to unpack .../28-g++-14_14.2.0-17ubuntu1_ppc64el.deb ... 206s Unpacking g++-14 (14.2.0-17ubuntu1) ... 206s Selecting previously unselected package g++-powerpc64le-linux-gnu. 206s Preparing to unpack .../29-g++-powerpc64le-linux-gnu_4%3a14.2.0-1ubuntu1_ppc64el.deb ... 206s Unpacking g++-powerpc64le-linux-gnu (4:14.2.0-1ubuntu1) ... 206s Selecting previously unselected package g++. 206s Preparing to unpack .../30-g++_4%3a14.2.0-1ubuntu1_ppc64el.deb ... 206s Unpacking g++ (4:14.2.0-1ubuntu1) ... 206s Selecting previously unselected package build-essential. 206s Preparing to unpack .../31-build-essential_12.10ubuntu1_ppc64el.deb ... 206s Unpacking build-essential (12.10ubuntu1) ... 206s Selecting previously unselected package libdebhelper-perl. 206s Preparing to unpack .../32-libdebhelper-perl_13.24.1ubuntu2_all.deb ... 206s Unpacking libdebhelper-perl (13.24.1ubuntu2) ... 206s Selecting previously unselected package libtool. 206s Preparing to unpack .../33-libtool_2.5.4-3build1_all.deb ... 206s Unpacking libtool (2.5.4-3build1) ... 206s Selecting previously unselected package dh-autoreconf. 206s Preparing to unpack .../34-dh-autoreconf_20_all.deb ... 206s Unpacking dh-autoreconf (20) ... 206s Selecting previously unselected package libarchive-zip-perl. 206s Preparing to unpack .../35-libarchive-zip-perl_1.68-1_all.deb ... 206s Unpacking libarchive-zip-perl (1.68-1) ... 206s Selecting previously unselected package libfile-stripnondeterminism-perl. 206s Preparing to unpack .../36-libfile-stripnondeterminism-perl_1.14.1-2_all.deb ... 206s Unpacking libfile-stripnondeterminism-perl (1.14.1-2) ... 206s Selecting previously unselected package dh-strip-nondeterminism. 206s Preparing to unpack .../37-dh-strip-nondeterminism_1.14.1-2_all.deb ... 206s Unpacking dh-strip-nondeterminism (1.14.1-2) ... 206s Selecting previously unselected package debugedit. 206s Preparing to unpack .../38-debugedit_1%3a5.1-2_ppc64el.deb ... 206s Unpacking debugedit (1:5.1-2) ... 206s Selecting previously unselected package dwz. 206s Preparing to unpack .../39-dwz_0.15-1build6_ppc64el.deb ... 206s Unpacking dwz (0.15-1build6) ... 206s Selecting previously unselected package gettext. 206s Preparing to unpack .../40-gettext_0.23.1-1_ppc64el.deb ... 206s Unpacking gettext (0.23.1-1) ... 206s Selecting previously unselected package intltool-debian. 206s Preparing to unpack .../41-intltool-debian_0.35.0+20060710.6_all.deb ... 206s Unpacking intltool-debian (0.35.0+20060710.6) ... 206s Selecting previously unselected package po-debconf. 206s Preparing to unpack .../42-po-debconf_1.0.21+nmu1_all.deb ... 206s Unpacking po-debconf (1.0.21+nmu1) ... 206s Selecting previously unselected package debhelper. 206s Preparing to unpack .../43-debhelper_13.24.1ubuntu2_all.deb ... 206s Unpacking debhelper (13.24.1ubuntu2) ... 207s Selecting previously unselected package dh-python. 207s Preparing to unpack .../44-dh-python_6.20250108_all.deb ... 207s Unpacking dh-python (6.20250108) ... 207s Selecting previously unselected package liberror-perl. 207s Preparing to unpack .../45-liberror-perl_0.17029-2_all.deb ... 207s Unpacking liberror-perl (0.17029-2) ... 207s Selecting previously unselected package git-man. 207s Preparing to unpack .../46-git-man_1%3a2.48.1-0ubuntu1_all.deb ... 207s Unpacking git-man (1:2.48.1-0ubuntu1) ... 207s Selecting previously unselected package git. 207s Preparing to unpack .../47-git_1%3a2.48.1-0ubuntu1_ppc64el.deb ... 207s Unpacking git (1:2.48.1-0ubuntu1) ... 207s Selecting previously unselected package git-revise. 207s Preparing to unpack .../48-git-revise_0.7.0-1_all.deb ... 207s Unpacking git-revise (0.7.0-1) ... 207s Selecting previously unselected package libexpat1-dev:ppc64el. 207s Preparing to unpack .../49-libexpat1-dev_2.6.4-1_ppc64el.deb ... 207s Unpacking libexpat1-dev:ppc64el (2.6.4-1) ... 207s Selecting previously unselected package zlib1g-dev:ppc64el. 207s Preparing to unpack .../50-zlib1g-dev_1%3a1.3.dfsg+really1.3.1-1ubuntu1_ppc64el.deb ... 207s Unpacking zlib1g-dev:ppc64el (1:1.3.dfsg+really1.3.1-1ubuntu1) ... 208s Selecting previously unselected package libpython3.13-dev:ppc64el. 208s Preparing to unpack .../51-libpython3.13-dev_3.13.2-1_ppc64el.deb ... 208s Unpacking libpython3.13-dev:ppc64el (3.13.2-1) ... 208s Selecting previously unselected package libpython3-dev:ppc64el. 208s Preparing to unpack .../52-libpython3-dev_3.13.1-1~exp2_ppc64el.deb ... 208s Unpacking libpython3-dev:ppc64el (3.13.1-1~exp2) ... 208s Selecting previously unselected package python3-mypy-extensions. 208s Preparing to unpack .../53-python3-mypy-extensions_1.0.0-1_all.deb ... 208s Unpacking python3-mypy-extensions (1.0.0-1) ... 208s Selecting previously unselected package python3-psutil. 208s Preparing to unpack .../54-python3-psutil_5.9.8-2build3_ppc64el.deb ... 208s Unpacking python3-psutil (5.9.8-2build3) ... 208s Selecting previously unselected package python3-mypy. 208s Preparing to unpack .../55-python3-mypy_1.15.0-2_ppc64el.deb ... 208s Unpacking python3-mypy (1.15.0-2) ... 209s Selecting previously unselected package mypy. 209s Preparing to unpack .../56-mypy_1.15.0-2_all.deb ... 209s Unpacking mypy (1.15.0-2) ... 209s Selecting previously unselected package pypy3-dev. 209s Preparing to unpack .../57-pypy3-dev_7.3.18+dfsg-2_all.deb ... 209s Unpacking pypy3-dev (7.3.18+dfsg-2) ... 209s Selecting previously unselected package python3-all. 209s Preparing to unpack .../58-python3-all_3.13.1-1~exp2_ppc64el.deb ... 209s Unpacking python3-all (3.13.1-1~exp2) ... 209s Selecting previously unselected package python3-iniconfig. 209s Preparing to unpack .../59-python3-iniconfig_1.1.1-2_all.deb ... 209s Unpacking python3-iniconfig (1.1.1-2) ... 209s Selecting previously unselected package python3-packaging. 209s Preparing to unpack .../60-python3-packaging_24.2-1_all.deb ... 209s Unpacking python3-packaging (24.2-1) ... 209s Selecting previously unselected package python3-pluggy. 209s Preparing to unpack .../61-python3-pluggy_1.5.0-1_all.deb ... 209s Unpacking python3-pluggy (1.5.0-1) ... 209s Selecting previously unselected package python3-pytest. 209s Preparing to unpack .../62-python3-pytest_8.3.4-1_all.deb ... 209s Unpacking python3-pytest (8.3.4-1) ... 209s Setting up dh-python (6.20250108) ... 210s Setting up python3-iniconfig (1.1.1-2) ... 211s Setting up python3.12-minimal (3.12.9-1) ... 213s Setting up libarchive-zip-perl (1.68-1) ... 213s Setting up python3-mypy-extensions (1.0.0-1) ... 213s Setting up libdebhelper-perl (13.24.1ubuntu2) ... 213s Setting up python3.12 (3.12.9-1) ... 215s Setting up m4 (1.4.19-5) ... 215s Setting up python3-all (3.13.1-1~exp2) ... 215s Setting up libgomp1:ppc64el (15-20250213-1ubuntu1) ... 215s Setting up pypy3 (7.3.18+dfsg-2) ... 220s running pypy3 rtupdate hooks for 7.3 236s running pypy3 post-rtupdate hooks for 7.3 236s Setting up python3-psutil (5.9.8-2build3) ... 237s Setting up liberror-perl (0.17029-2) ... 237s Setting up autotools-dev (20220109.1) ... 237s Setting up python3-packaging (24.2-1) ... 237s Setting up libexpat1-dev:ppc64el (2.6.4-1) ... 237s Setting up libquadmath0:ppc64el (15-20250213-1ubuntu1) ... 237s Setting up libmpc3:ppc64el (1.3.1-1build2) ... 237s Setting up python3-mypy (1.15.0-2) ... 243s Setting up autopoint (0.23.1-1) ... 243s Setting up pypy3-dev (7.3.18+dfsg-2) ... 243s Setting up autoconf (2.72-3) ... 243s Setting up python3-pluggy (1.5.0-1) ... 243s Setting up libubsan1:ppc64el (15-20250213-1ubuntu1) ... 243s Setting up zlib1g-dev:ppc64el (1:1.3.dfsg+really1.3.1-1ubuntu1) ... 243s Setting up dwz (0.15-1build6) ... 243s Setting up libasan8:ppc64el (15-20250213-1ubuntu1) ... 243s Setting up debugedit (1:5.1-2) ... 243s Setting up mypy (1.15.0-2) ... 243s Setting up git-man (1:2.48.1-0ubuntu1) ... 243s Setting up libtsan2:ppc64el (15-20250213-1ubuntu1) ... 243s Setting up libisl23:ppc64el (0.27-1) ... 243s Setting up libcc1-0:ppc64el (15-20250213-1ubuntu1) ... 243s Setting up liblsan0:ppc64el (15-20250213-1ubuntu1) ... 243s Setting up libitm1:ppc64el (15-20250213-1ubuntu1) ... 243s Setting up automake (1:1.17-3) ... 243s update-alternatives: using /usr/bin/automake-1.17 to provide /usr/bin/automake (automake) in auto mode 243s Setting up libfile-stripnondeterminism-perl (1.14.1-2) ... 243s Setting up gettext (0.23.1-1) ... 243s Setting up python3-pytest (8.3.4-1) ... 245s Setting up intltool-debian (0.35.0+20060710.6) ... 245s Setting up libpython3.13-dev:ppc64el (3.13.2-1) ... 245s Setting up git (1:2.48.1-0ubuntu1) ... 245s Setting up cpp-14-powerpc64le-linux-gnu (14.2.0-17ubuntu1) ... 245s Setting up cpp-14 (14.2.0-17ubuntu1) ... 245s Setting up dh-strip-nondeterminism (1.14.1-2) ... 245s Setting up git-revise (0.7.0-1) ... 245s Setting up libgcc-14-dev:ppc64el (14.2.0-17ubuntu1) ... 245s Setting up libstdc++-14-dev:ppc64el (14.2.0-17ubuntu1) ... 245s Setting up cpp-powerpc64le-linux-gnu (4:14.2.0-1ubuntu1) ... 245s Setting up gcc-14-powerpc64le-linux-gnu (14.2.0-17ubuntu1) ... 245s Setting up libpython3-dev:ppc64el (3.13.1-1~exp2) ... 245s Setting up g++-14-powerpc64le-linux-gnu (14.2.0-17ubuntu1) ... 245s Setting up po-debconf (1.0.21+nmu1) ... 245s Setting up gcc-14 (14.2.0-17ubuntu1) ... 245s Setting up gcc-powerpc64le-linux-gnu (4:14.2.0-1ubuntu1) ... 245s Setting up cpp (4:14.2.0-1ubuntu1) ... 245s Setting up g++-14 (14.2.0-17ubuntu1) ... 245s Setting up g++-powerpc64le-linux-gnu (4:14.2.0-1ubuntu1) ... 245s Setting up libtool (2.5.4-3build1) ... 245s Setting up gcc (4:14.2.0-1ubuntu1) ... 245s Setting up dh-autoreconf (20) ... 245s Setting up g++ (4:14.2.0-1ubuntu1) ... 245s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 245s Setting up build-essential (12.10ubuntu1) ... 245s Setting up debhelper (13.24.1ubuntu2) ... 245s Processing triggers for man-db (2.13.0-1) ... 248s Processing triggers for install-info (7.1.1-1) ... 248s Processing triggers for libc-bin (2.40-4ubuntu1) ... 248s Processing triggers for systemd (257.2-3ubuntu1) ... 250s autopkgtest [07:28:40]: test command1: pytest-3 250s autopkgtest [07:28:40]: test command1: [----------------------- 251s ============================= test session starts ============================== 251s platform linux -- Python 3.13.2, pytest-8.3.4, pluggy-1.5.0 251s rootdir: /tmp/autopkgtest.hO9b4C/build.ndZ/src 251s plugins: typeguard-4.4.1 251s collected 38 items 251s 252s tests/test_cut.py .. [ 5%] 255s tests/test_fixup.py .............. [ 42%] 257s tests/test_gpgsign.py . [ 44%] 263s tests/test_interactive.py .......... [ 71%] 277s tests/test_rerere.py FFF.. [ 84%] 278s tests/test_reword.py ...... [100%] 278s 278s =================================== FAILURES =================================== 278s ________________________ test_reuse_recorded_resolution ________________________ 278s 278s repo = 278s 278s def test_reuse_recorded_resolution(repo): 278s history_with_two_conflicting_commits(autoUpdate=True) 278s 278s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 278s flip_last_two_commits(repo, ed) 278s with ed.next_file() as f: 278s f.replace_dedent("resolved two\n") 278s with ed.next_file() as f: 278s f.replace_dedent("resolved one\n") 278s 278s tree_after_resolving_conflicts = repo.get_commit("HEAD").tree() 278s bash("git reset --hard HEAD@{1}") 278s 278s # Now we can change the order of the two commits and reuse the recorded conflict resolution. 278s with editor_main(("-i", "HEAD~~")) as ed: 278s flip_last_two_commits(repo, ed) 278s 278s assert tree_after_resolving_conflicts == repo.get_commit("HEAD").tree() 278s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 278s 278s /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/test_rerere.py:39: 278s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 278s 278s diff = b'' 278s 278s def hunks(diff: bytes) -> bytes: 278s > return diff[diff.index(b"@@") :] 278s E ValueError: subsection not found 278s 278s /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/test_rerere.py:370: ValueError 278s ----------------------------- Captured stdout call ----------------------------- 278s [master (root-commit) d72132e] initial commit 278s Author: Bash Author 278s 1 file changed, 1 insertion(+) 278s create mode 100644 file 278s [master 698fe81] commit one 278s Author: Bash Author 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s [master b1efb1b] commit two 278s Author: Bash Author 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 278s Conflict applying 'commit two' 278s Path: '/file' 278s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 278s pick e51ab202e87f commit two 278s Conflict applying 'commit one' 278s Path: '/file' 278s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 278s pick dc50430ecbd2 commit one 278s Updating refs/heads/master (b1efb1b8ffe680f67bd9e6824fcf0aa55d561139 => dc50430ecbd2d0697ee9266ba6057e0e0b511d7f) 278s HEAD is now at dc50430 commit one 278s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'check': True} 278s Conflict applying 'commit one' 278s Path: '/file' 278s Edit conflicted file? (Y/n) 278s ----------------------------- Captured stderr call ----------------------------- 278s 127.0.0.1 - - [19/Feb/2025 07:28:53] "POST / HTTP/1.1" 200 - 278s 127.0.0.1 - - [19/Feb/2025 07:28:53] "POST / HTTP/1.1" 200 - 278s 127.0.0.1 - - [19/Feb/2025 07:28:53] "POST / HTTP/1.1" 200 - 278s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 278s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 278s 127.0.0.1 - - [19/Feb/2025 07:28:54] "POST / HTTP/1.1" 200 - 278s Traceback (most recent call last): 278s File "", line 198, in _run_module_as_main 278s File "", line 88, in _run_code 278s File "/usr/lib/python3/dist-packages/gitrevise/__main__.py", line 4, in 278s main() 278s ~~~~^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 263, in main 278s inner_main(args, repo) 278s ~~~~~~~~~~^^^^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 254, in inner_main 278s interactive(args, repo, staged, head) 278s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 141, in interactive 278s new_head = apply_todos(base, todos, reauthor=args.reauthor) 278s File "/usr/lib/python3/dist-packages/gitrevise/todo.py", line 251, in apply_todos 278s rebased = step.commit.rebase(current).update(message=step.message) 278s ~~~~~~~~~~~~~~~~~~^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/odb.py", line 621, in rebase 278s return rebase(self, parent) 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 47, in rebase 278s tree = merge_trees( 278s Path("/"), 278s ...<3 lines>... 278s get_tree(commit), 278s ) 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 90, in merge_trees 278s merged = merge_entries( 278s path / name.decode(errors="replace"), 278s ...<3 lines>... 278s other.entries.get(name), 278s ) 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 165, in merge_entries 278s merge_blobs(path, labels, current.blob(), baseblob, other.blob()).oid, 278s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 235, in merge_blobs 278s if input(" Edit conflicted file? (Y/n) ").lower() == "n": 278s ~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s EOFError: EOF when reading a line 278s __________________________ test_rerere_no_autoupdate ___________________________ 278s 278s repo = 278s 278s def test_rerere_no_autoupdate(repo): 278s history_with_two_conflicting_commits(autoUpdate=False) 278s 278s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 278s flip_last_two_commits(repo, ed) 278s with ed.next_file() as f: 278s f.replace_dedent("resolved two\n") 278s with ed.next_file() as f: 278s f.replace_dedent("resolved one\n") 278s 278s tree_after_resolving_conflicts = repo.get_commit("HEAD").tree() 278s bash("git reset --hard HEAD@{1}") 278s 278s # Use the recorded resolution by confirming both times. 278s with editor_main(("-i", "HEAD~~"), input=b"y\ny\n") as ed: 278s flip_last_two_commits(repo, ed) 278s assert tree_after_resolving_conflicts == repo.get_commit("HEAD").tree() 278s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 278s 278s /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/test_rerere.py:76: 278s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 278s 278s diff = b'' 278s 278s def hunks(diff: bytes) -> bytes: 278s > return diff[diff.index(b"@@") :] 278s E ValueError: subsection not found 278s 278s /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/test_rerere.py:370: ValueError 278s ----------------------------- Captured stdout call ----------------------------- 278s [master (root-commit) d72132e] initial commit 278s Author: Bash Author 278s 1 file changed, 1 insertion(+) 278s create mode 100644 file 278s [master 698fe81] commit one 278s Author: Bash Author 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s [master b1efb1b] commit two 278s Author: Bash Author 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 278s Conflict applying 'commit two' 278s Path: '/file' 278s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 278s pick e51ab202e87f commit two 278s Conflict applying 'commit one' 278s Path: '/file' 278s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 278s pick dc50430ecbd2 commit one 278s Updating refs/heads/master (b1efb1b8ffe680f67bd9e6824fcf0aa55d561139 => dc50430ecbd2d0697ee9266ba6057e0e0b511d7f) 278s HEAD is now at dc50430 commit one 278s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\n', 'check': True} 278s Conflict applying 'commit one' 278s Path: '/file' 278s Edit conflicted file? (Y/n) editor error: Editor exited with status Command '['/bin/sh', '-ec', '/usr/bin/python3 /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/dummy_editor.py http://127.0.0.1:46291/ "$@"', '/usr/bin/python3 /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/dummy_editor.py http://127.0.0.1:46291/', 'file']' returned non-zero exit status 1. 278s ----------------------------- Captured stderr call ----------------------------- 278s 127.0.0.1 - - [19/Feb/2025 07:28:54] "POST / HTTP/1.1" 200 - 278s 127.0.0.1 - - [19/Feb/2025 07:28:54] "POST / HTTP/1.1" 200 - 278s 127.0.0.1 - - [19/Feb/2025 07:28:55] "POST / HTTP/1.1" 200 - 278s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 278s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 278s 127.0.0.1 - - [19/Feb/2025 07:28:55] "POST / HTTP/1.1" 200 - 278s Traceback (most recent call last): 278s File "/tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/dummy_editor.py", line 17, in 278s run_editor(url=sys.argv[1], path=Path(sys.argv[2]).resolve()) 278s ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s File "/tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/dummy_editor.py", line 8, in run_editor 278s with urlopen(url, data=path.read_bytes(), timeout=10) as r: 278s ~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s File "/usr/lib/python3.13/urllib/request.py", line 189, in urlopen 278s return opener.open(url, data, timeout) 278s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^ 278s File "/usr/lib/python3.13/urllib/request.py", line 489, in open 278s response = self._open(req, data) 278s File "/usr/lib/python3.13/urllib/request.py", line 506, in _open 278s result = self._call_chain(self.handle_open, protocol, protocol + 278s '_open', req) 278s File "/usr/lib/python3.13/urllib/request.py", line 466, in _call_chain 278s result = func(*args) 278s File "/usr/lib/python3.13/urllib/request.py", line 1348, in http_open 278s return self.do_open(http.client.HTTPConnection, req) 278s ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s File "/usr/lib/python3.13/urllib/request.py", line 1323, in do_open 278s r = h.getresponse() 278s File "/usr/lib/python3.13/http/client.py", line 1430, in getresponse 278s response.begin() 278s ~~~~~~~~~~~~~~^^ 278s File "/usr/lib/python3.13/http/client.py", line 331, in begin 278s version, status, reason = self._read_status() 278s ~~~~~~~~~~~~~~~~~^^ 278s File "/usr/lib/python3.13/http/client.py", line 292, in _read_status 278s line = str(self.fp.readline(_MAXLINE + 1), "iso-8859-1") 278s ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^ 278s File "/usr/lib/python3.13/socket.py", line 719, in readinto 278s return self._sock.recv_into(b) 278s ~~~~~~~~~~~~~~~~~~~~^^^ 278s TimeoutError: timed out 278s ______________________________ test_rerere_merge _______________________________ 278s 278s repo = 278s 278s def test_rerere_merge(repo): 278s (repo.workdir / "file").write_bytes(10 * b"x\n") 278s bash( 278s """ 278s git config rerere.enabled true 278s git config rerere.autoUpdate true 278s git add file; git commit -m 'initial commit' 278s """ 278s ) 278s changeline("file", 0, b"original1\n") 278s bash("git commit -am 'commit 1'") 278s changeline("file", 0, b"original2\n") 278s bash("git commit -am 'commit 2'") 278s 278s # Record a resolution for changing the order of two commits. 278s with editor_main(("-i", "HEAD~~"), input=b"y\ny\ny\ny\n") as ed: 278s flip_last_two_commits(repo, ed) 278s with ed.next_file() as f: 278s f.replace_dedent(b"resolved1\n" + 9 * b"x\n") 278s with ed.next_file() as f: 278s f.replace_dedent(b"resolved2\n" + 9 * b"x\n") 278s # Go back to the old history so we can try replaying the resolution. 278s bash("git reset --hard HEAD@{1}") 278s 278s # Introduce an unrelated change that will not conflict to check that we can 278s # merge the file contents, and not just use the recorded postimage as is. 278s changeline("file", 9, b"unrelated change, present in all commits\n") 278s bash("git add file") 278s main(["HEAD~2"]) 278s 278s with editor_main(("-i", "HEAD~~")) as ed: 278s flip_last_two_commits(repo, ed) 278s 278s assert hunks(repo.git("show", "-U0", "HEAD~")) == dedent( 278s """\ 278s @@ -1 +1 @@ 278s -x 278s +resolved1""" 278s ) 278s assert hunks(repo.git("show", "-U0", "HEAD")) == dedent( 278s """\ 278s @@ -1 +1 @@ 278s -resolved1 278s +resolved2""" 278s ) 278s > leftover_index = hunks(repo.git("diff", "-U0", "HEAD")) 278s 278s /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/test_rerere.py:144: 278s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 278s 278s diff = b'' 278s 278s def hunks(diff: bytes) -> bytes: 278s > return diff[diff.index(b"@@") :] 278s E ValueError: subsection not found 278s 278s /tmp/autopkgtest.hO9b4C/build.ndZ/src/tests/test_rerere.py:370: ValueError 278s ----------------------------- Captured stdout call ----------------------------- 278s [master (root-commit) 78ab633] initial commit 278s Author: Bash Author 278s 1 file changed, 10 insertions(+) 278s create mode 100644 file 278s [master bc4398a] commit 1 278s Author: Bash Author 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s [master 8ede3c3] commit 2 278s Author: Bash Author 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'input': b'y\ny\ny\ny\n', 'check': True} 278s Conflict applying 'commit 2' 278s Path: '/file' 278s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 278s pick 8d5d4e07cf09 commit 2 278s Conflict applying 'commit 1' 278s Path: '/file' 278s Edit conflicted file? (Y/n) Merge successful? (y/N) Recording conflict resolution 278s pick 4afa53fa2fa8 commit 1 278s Updating refs/heads/master (8ede3c350c17709e6a2b5f4775e4a12770b88dc1 => 4afa53fa2fa843a3a089d55050139011198ab3d0) 278s HEAD is now at 4afa53f commit 1 278s Running ['/usr/bin/python3', '-m', 'gitrevise', 'HEAD~2'] {'check': True} 278s Applying staged changes to 'HEAD~2' 278s 035bca1522bd initial commit 278s 712c4d25b5e2 commit 2 278s 33e258e25f6a commit 1 278s Updating refs/heads/master (4afa53fa2fa843a3a089d55050139011198ab3d0 => 33e258e25f6a8d5629beb2c02cb1b7e388b61791) 278s Running ['/usr/bin/python3', '-m', 'gitrevise', '-i', 'HEAD~~'] {'check': True} 278s Conflict applying 'commit 1' 278s Path: '/file' 278s Edit conflicted file? (Y/n) 278s ----------------------------- Captured stderr call ----------------------------- 278s 127.0.0.1 - - [19/Feb/2025 07:29:06] "POST / HTTP/1.1" 200 - 278s 127.0.0.1 - - [19/Feb/2025 07:29:06] "POST / HTTP/1.1" 200 - 278s 127.0.0.1 - - [19/Feb/2025 07:29:06] "POST / HTTP/1.1" 200 - 278s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 278s warning: log for ref HEAD unexpectedly ended on Thu, 13 Jul 2017 21:40:00 -0500 278s 127.0.0.1 - - [19/Feb/2025 07:29:06] "POST / HTTP/1.1" 200 - 278s Traceback (most recent call last): 278s File "", line 198, in _run_module_as_main 278s File "", line 88, in _run_code 278s File "/usr/lib/python3/dist-packages/gitrevise/__main__.py", line 4, in 278s main() 278s ~~~~^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 263, in main 278s inner_main(args, repo) 278s ~~~~~~~~~~^^^^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 254, in inner_main 278s interactive(args, repo, staged, head) 278s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/tui.py", line 141, in interactive 278s new_head = apply_todos(base, todos, reauthor=args.reauthor) 278s File "/usr/lib/python3/dist-packages/gitrevise/todo.py", line 251, in apply_todos 278s rebased = step.commit.rebase(current).update(message=step.message) 278s ~~~~~~~~~~~~~~~~~~^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/odb.py", line 621, in rebase 278s return rebase(self, parent) 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 47, in rebase 278s tree = merge_trees( 278s Path("/"), 278s ...<3 lines>... 278s get_tree(commit), 278s ) 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 90, in merge_trees 278s merged = merge_entries( 278s path / name.decode(errors="replace"), 278s ...<3 lines>... 278s other.entries.get(name), 278s ) 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 165, in merge_entries 278s merge_blobs(path, labels, current.blob(), baseblob, other.blob()).oid, 278s ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s File "/usr/lib/python3/dist-packages/gitrevise/merge.py", line 235, in merge_blobs 278s if input(" Edit conflicted file? (Y/n) ").lower() == "n": 278s ~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 278s EOFError: EOF when reading a line 278s =========================== short test summary info ============================ 278s FAILED tests/test_rerere.py::test_reuse_recorded_resolution - ValueError: sub... 278s FAILED tests/test_rerere.py::test_rerere_no_autoupdate - ValueError: subsecti... 278s FAILED tests/test_rerere.py::test_rerere_merge - ValueError: subsection not f... 278s ======================== 3 failed, 35 passed in 28.05s ========================= 279s autopkgtest [07:29:09]: test command1: -----------------------] 279s autopkgtest [07:29:09]: test command1: - - - - - - - - - - results - - - - - - - - - - 279s command1 FAIL non-zero exit status 1 280s autopkgtest [07:29:10]: @@@@@@@@@@@@@@@@@@@@ summary 280s command1 FAIL non-zero exit status 1 284s nova [W] Using flock in prodstack6-ppc64el 284s Creating nova instance adt-plucky-ppc64el-git-revise-20250219-072430-juju-7f2275-prod-proposed-migration-environment-15-9e3c10c1-e42b-4e94-b0f4-71ae01c34219 from image adt/ubuntu-plucky-ppc64el-server-20250218.img (UUID 9318aa34-3d3c-43c5-86d2-aaf9390f2f5d)... 284s nova [W] Timed out waiting for c591bd15-392a-42c1-91c5-05c5766d975e to get deleted.