diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | scripts/ci.sh | 4 | ||||
| -rw-r--r-- | tests/test_snekbox.py | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index b291436..2e83771 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_install: env: global: + - PYTHONEXECUTABLE=/home/travis/build/discord-python/snekbox/.venv/bin/python3 - PIPENV_VENV_IN_PROJECT=1 - PIPENV_IGNORE_VIRTUALENVS=1 - PIPENV_NOSPIN=1 diff --git a/scripts/ci.sh b/scripts/ci.sh index a49a64e..170d553 100644 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -3,5 +3,5 @@ echo $path chmod +x binaries/nsjail2.6-ubuntu-x86_64 sudo updatedb sudo locate libprotobuf -echo $(pwd)/binaries/nsjail2.6-ubuntu-x86_64 -Mo --rlimit_as 700 --chroot / -E LANG=en_US.UTF-8 -R/usr -R/lib -R/lib64 --user nobody --group nogroup --time_limit 2 --disable_proc --iface_no_lo --quiet -- /usr/bin/python3.6 -ISq -c 'print("test")' -$(pwd)/binaries/nsjail2.6-ubuntu-x86_64 -Mo --rlimit_as 700 --chroot / -E LANG=en_US.UTF-8 -R/usr -R/lib -R/lib64 --user nobody --group nogroup --time_limit 2 --disable_proc --iface_no_lo --quiet -- /usr/bin/python3.6 -ISq -c 'print("test")' +echo $(pwd)/binaries/nsjail2.6-ubuntu-x86_64 -Mo --rlimit_as 700 --chroot / -E LANG=en_US.UTF-8 -R/usr -R/lib -R/lib64 --user nobody --group nogroup --time_limit 2 --disable_proc --iface_no_lo --quiet -- $PYTHONEXECUTABLE -ISq -c 'print("test")' +$(pwd)/binaries/nsjail2.6-ubuntu-x86_64 -Mo --rlimit_as 700 --chroot / -E LANG=en_US.UTF-8 -R/usr -R/lib -R/lib64 --user nobody --group nogroup --time_limit 2 --disable_proc --iface_no_lo --quiet -- $PYTHONEXECUTABLE -ISq -c 'print("test")' diff --git a/tests/test_snekbox.py b/tests/test_snekbox.py index cc02ef8..8ebd0c0 100644 --- a/tests/test_snekbox.py +++ b/tests/test_snekbox.py @@ -3,9 +3,9 @@ import pytest import os from snekbox import Snekbox - +python_binary = os.environ.get('PYTHONEXECUTABLE', '/usr/bin/python3.6') nsjail = os.sep.join([os.getcwd(), f'binaries{os.sep}nsjail2.6-ubuntu-x86_64']) -snek = Snekbox(nsjail_binary=nsjail, python_binary='/usr/bin/python3.6') +snek = Snekbox(nsjail_binary=nsjail, python_binary=python_binary) class SnekTests(unittest.TestCase): def test_nsjail(self): |