Switch build-time tests and autopkgtests to Python 3

This commit is contained in:
Simon McVittie committed 2018-01-17 15:28:04 +00:00
1 parent b89e619851
commit a2253543b4
3 files changed
+50 -4

No files matched your search

+45
View File
@@ -0,0 +1,45 @@
From: Simon McVittie <smcv@debian.org>
Date: Wed, 17 Jan 2018 14:07:32 +0000
Subject: Use Python 3 for tests
Forwarded: not-needed
Signed-off-by: Simon McVittie <smcv@debian.org>
---
tests/bootloader-entries-crosscheck.py | 2 +-
tests/test-basic-user-only.sh | 2 +-
tests/test-concurrency.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py
index 5faa548..41f6956 100755
--- a/tests/bootloader-entries-crosscheck.py
+++ b/tests/bootloader-entries-crosscheck.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Copyright (C) 2015 Red Hat
#
diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh
index 6a2ca25..662d32f 100755
--- a/tests/test-basic-user-only.sh
+++ b/tests/test-basic-user-only.sh
@@ -26,7 +26,7 @@ extra_basic_tests=5
. $(dirname $0)/basic-test.sh
$CMD_PREFIX ostree --version > version.yaml
-python -c 'import yaml; yaml.safe_load(open("version.yaml"))'
+python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))'
echo "ok yaml version"
# Reset things so we don't inherit a lot of state from earlier tests
diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py
index 3a0ce10..3ec3681 100755
--- a/tests/test-concurrency.py
+++ b/tests/test-concurrency.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2017 Colin Walters <walters@verbum.org>
#
+1
View File
@@ -2,3 +2,4 @@ test-concurrency-Use-Python-3-syntax-for-octal.patch
test-concurrency-Replace-range-with-xrange.patch
test-concurrency-Explicitly-use-floor-division.patch
tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch
debian/Use-Python-3-for-tests.patch