From 971265e4e48f2ff512633b27c90569315ff168ff Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 17 Jan 2018 14:07:32 +0000
Subject: [PATCH] Use Python 3 for tests

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #1463
Approved by: cgwalters
---
 ci/build.sh                            | 9 ++++++++-
 ci/travis-install.sh                   | 2 +-
 tests/bootloader-entries-crosscheck.py | 2 +-
 tests/test-basic-user-only.sh          | 2 +-
 tests/test-concurrency.py              | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ci/build.sh b/ci/build.sh
index b56f57c6..be05604a 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -16,7 +16,14 @@ pkg_install sudo which attr fuse strace \
 if test -n "${CI_PKGS:-}"; then
     pkg_install ${CI_PKGS}
 fi
-pkg_install_if_os fedora gjs gnome-desktop-testing parallel coccinelle clang
+pkg_install_if_os fedora gjs gnome-desktop-testing parallel coccinelle clang \
+                  python3-PyYAML
+(. /etc/os-release;
+ if test "${ID}" = "centos"; then
+     rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+     pkg_install python34{,-PyYAML}
+ fi
+)
 
 # Default libcurl on by default in fedora unless libsoup is enabled
 if sh -c '. /etc/os-release; test "${ID}" = fedora'; then
diff --git a/ci/travis-install.sh b/ci/travis-install.sh
index 5d3d5a91..8dd373d3 100755
--- a/ci/travis-install.sh
+++ b/ci/travis-install.sh
@@ -110,7 +110,7 @@ case "$ci_distro" in
             libcurl4-openssl-dev \
             procps \
             zlib1g-dev \
-            python-yaml \
+            python3-yaml \
             ${NULL}
 
         if [ "$ci_in_docker" = yes ]; then
diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py
index 5faa5487..41f6956e 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 bea7b77f..5f27014e 100755
--- a/tests/test-basic-user-only.sh
+++ b/tests/test-basic-user-only.sh
@@ -28,7 +28,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 3a0ce103..3ec3681c 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>
 #