From: Michael Prokop <mika@grml.org>
Date: Thu, 2 Apr 2020 15:13:33 +0000 (+0200)
Subject: autopkgtests: drop python2 support and depend on python3 only
X-Git-Tag: v0.18.0~3
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=1fa8aac195e43574b2704b2a11b78295896b0dd3

autopkgtests: drop python2 support and depend on python3 only

The smoke-grml2usb-py3 test was referring to python2.
python2 is no longer supported within Debian, let's drop
support for it.

Closes: #936663
---

diff --git a/debian/tests/control b/debian/tests/control
index d6be2df..7df3b9e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,21 +1,9 @@
-Tests: smoke-grml2usb-py2
-Depends:
- dosfstools,
- isolinux,
- kpartx,
- python2,
- syslinux,
- syslinux-common,
- xorriso,
- @,
-Restrictions: needs-root, isolation-machine, breaks-testbed
-
 Tests: smoke-grml2usb-py3
 Depends:
  dosfstools,
  isolinux,
  kpartx,
- python2,
+ python3,
  syslinux,
  syslinux-common,
  xorriso,
diff --git a/debian/tests/smoke-grml2usb-py2 b/debian/tests/smoke-grml2usb-py2
deleted file mode 100755
index 67b45d1..0000000
--- a/debian/tests/smoke-grml2usb-py2
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-exec 2>&1
-set -ex
-
-TMPDIR=$(mktemp -d)
-LODEV=$(losetup -f)
-cleanup() {
-  kpartx -d "$LODEV" || true
-  losetup -d "$LODEV" || true
-  rm -rf "$TMPDIR"
-}
-trap cleanup EXIT
-
-mkdir "$TMPDIR"/isoroot "$TMPDIR"/isoroot/boot "$TMPDIR"/isoroot/boot/isolinux
-cp /usr/lib/ISOLINUX/isolinux.bin "$TMPDIR"/isoroot/boot/isolinux/
-echo 'FAKE' > "$TMPDIR"/isoroot/grml-version
-echo 'LOGO' > "$TMPDIR"/isoroot/boot/logo.16
-touch "$TMPDIR"/isoroot/boot/isolinux/FAKE_default.cfg
-touch "$TMPDIR"/isoroot/boot/isolinux/FAKE_grml.cfg
-touch "$TMPDIR"/isoroot/boot/isolinux/hidden.cfg
-xorriso -as mkisofs -l -r -J -no-pad -no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -o "$TMPDIR"/fake.iso "$TMPDIR"/isoroot
-xorriso -dev "$TMPDIR"/fake.iso -ls
-
-dd if=/dev/zero of="$TMPDIR"/blockdev bs=1M count=50
-
-sfdisk "$TMPDIR"/blockdev <<EOT
-label: dos
-label-id: 0x00000000
-unit: sectors
-
-p1 : start=        2048, size=      100352, type=6, bootable
-EOT
-
-losetup -P "$LODEV" "$TMPDIR"/blockdev
-
-python2 $(which grml2usb) --bootloader-only --verbose --skip-usb-check --force --fat16 "$TMPDIR"/fake.iso "$LODEV"p1