Run python2 or python3 depending on what's used

On a system with dependencies installed for python3 but not for python2,
we have to make sure python3 is used everywhere since 'python' might be running
the python2 interpreter.

This helps with some problems in #2400, but doesn't fix the issue completely.
This commit is contained in:
Antonio Larrosa 2017-01-21 11:22:49 +01:00
parent 45bed808d3
commit 1e4378d636

View file

@ -15,6 +15,7 @@
from __future__ import division, absolute_import, print_function
import sys
import re
import os.path
import unittest
@ -39,7 +40,7 @@ class TestHelper(helper.TestHelper):
# A Python script that copies the file and appends a tag.
stub = os.path.join(_common.RSRC, b'convert_stub.py').decode('utf-8')
return u"python '{}' $source $dest {}".format(stub, tag)
return u"python{} '{}' $source $dest {}".format(sys.version_info.major, stub, tag)
def assertFileTag(self, path, tag): # noqa
"""Assert that the path is a file and the files content ends with `tag`.