From 0800e971a10789acb966e25b75c0d487903d1a70 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 18:14:02 +0800 Subject: [PATCH 01/11] Updates to hitch framework - also removed parameterized tests via jinja2 - it's really an advanced feature. --- {{cookiecutter.repo_name}}/.gitignore | 1 + {{cookiecutter.repo_name}}/tests/base.yml | 4 ---- {{cookiecutter.repo_name}}/tests/engine.py | 12 ++++++++-- .../tests/hitchreqs.txt | 22 ++++++++++++++++--- {{cookiecutter.repo_name}}/tests/settings.yml | 21 ++---------------- {{cookiecutter.repo_name}}/tests/stub.test | 8 +------ 6 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 {{cookiecutter.repo_name}}/tests/base.yml diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.repo_name}}/.gitignore index 13567ebd0..884c920d1 100644 --- a/{{cookiecutter.repo_name}}/.gitignore +++ b/{{cookiecutter.repo_name}}/.gitignore @@ -55,3 +55,4 @@ node_modules/ # virtual environments .env +.hitch diff --git a/{{cookiecutter.repo_name}}/tests/base.yml b/{{cookiecutter.repo_name}}/tests/base.yml deleted file mode 100644 index 844f12712..000000000 --- a/{{cookiecutter.repo_name}}/tests/base.yml +++ /dev/null @@ -1,4 +0,0 @@ -{% raw %}{% for python_version in python_versions %} -{% block test scoped %} -{% endblock %} -{% endfor %}{% endraw %} diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index 388b08fde..fd818748c 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -45,12 +45,20 @@ class ExecutionEngine(hitchtest.ExecutionEngine): shutdown_timeout=5.0, ) - postgres_user = hitchpostgres.PostgresUser("{{cookiecutter.repo_name}}", "password") + postgres_user = hitchpostgres.PostgresUser( + "{{cookiecutter.repo_name}}", + "password" + ) self.services['Postgres'] = hitchpostgres.PostgresService( postgres_package=postgres_package, users=[postgres_user, ], - databases=[hitchpostgres.PostgresDatabase("{{cookiecutter.repo_name}}", postgres_user), ] + databases=[ + hitchpostgres.PostgresDatabase( + "{{cookiecutter.repo_name}}", + postgres_user + ), + ] ) self.services['HitchSMTP'] = hitchsmtp.HitchSMTPService(port=1025) diff --git a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt index ddb453bf8..197264d66 100644 --- a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt +++ b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt @@ -1,26 +1,42 @@ click==5.1 colorama==0.3.3 +decorator==4.0.2 +docopt==0.6.2 faketime==0.9.6.3 hitchcron==0.2 hitchpostgres==0.6.3 -hitchpython==0.3.5 +hitchpython==0.3.6 hitchredis==0.4.3 -hitchselenium==0.4.1 -hitchserve==0.4.4 +hitchselenium==0.4.3 +hitchserve==0.4.5 hitchsmtp==0.2.1 hitchtest==0.8.0 humanize==0.5.1 +ipykernel==4.0.3 ipython==4.0.0 +ipython-genutils==0.1.0 Jinja2==2.8 +jupyter-client==4.0.0 +jupyter-console==4.0.2 +jupyter-core==4.0.6 MarkupSafe==0.23 +path.py==8.1.1 patool==1.8 +pexpect==3.3 +pickleshare==0.5 psutil==3.2.1 +pykwalify==1.4.1 python-build==0.2.3 +python-dateutil==2.4.2 pyuv==1.2.0 PyYAML==3.11 +pyzmq==14.7.0 requests==2.7.0 selenium==2.47.3 +simplegeneric==0.8.1 six==1.9.0 tblib==1.1.0 tornado==4.2.1 +traitlets==4.0.0 +unixpackage==0.3 xeger==0.3 diff --git a/{{cookiecutter.repo_name}}/tests/settings.yml b/{{cookiecutter.repo_name}}/tests/settings.yml index 7ea14f07e..655374ea9 100644 --- a/{{cookiecutter.repo_name}}/tests/settings.yml +++ b/{{cookiecutter.repo_name}}/tests/settings.yml @@ -1,6 +1,6 @@ postgres_version: 9.3.9 redis_version: 2.8.4 -django_version: 1.8.3 +django_version: 1.8.4 celery_version: 3.1.18 pause_on_success: false pause_on_failure: true @@ -18,26 +18,11 @@ environment: - approved_platforms: - linux - darwin - - freeports: - - 1025 - - 8000 - - 15432 - - 16379 - - brew: - - libtool - - automake - - node - - debs: - - python-setuptools - - python3-dev - - python-virtualenv - - python-pip + - packages: - firefox - automake - libtool - - libreadline6 - libreadline6-dev - - libreadline-dev - libsqlite3-dev - libpq-dev - libxml2 @@ -55,5 +40,3 @@ environment: - libwebp-dev - zlib1g-dev - gettext - - python-dev - - build-essential diff --git a/{{cookiecutter.repo_name}}/tests/stub.test b/{{cookiecutter.repo_name}}/tests/stub.test index 88b4a1d0d..7772217d3 100644 --- a/{{cookiecutter.repo_name}}/tests/stub.test +++ b/{{cookiecutter.repo_name}}/tests/stub.test @@ -1,10 +1,4 @@ -{% raw %}{% extends "base.yml" %} -{% block test %} -- engine: engine.py:ExecutionEngine - name: Stub {{ python_version }} - preconditions: - python_version: "{{ python_version }}" +- name: Stub scenario: - Load website - Pause -{% endblock %}{% endraw %} From 4bb3a6a33e7b8235886c588769385b5a46e6fdec Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 18:18:52 +0800 Subject: [PATCH 02/11] Specify python version to test with in engine.py --- {{cookiecutter.repo_name}}/tests/engine.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index fd818748c..d3ce0b79b 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -18,9 +18,7 @@ class ExecutionEngine(hitchtest.ExecutionEngine): def set_up(self): """Ensure virtualenv present, then run all services.""" - python_package = hitchpython.PythonPackage( - python_version=self.preconditions['python_version'] - ) + python_package = hitchpython.PythonPackage("2.7.10") python_package.build() python_package.verify() From 5823c0bdc8c576a8a21dc34f41f580046593dbc6 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 19:11:06 +0800 Subject: [PATCH 03/11] Added README just for tests and upgraded unixpackage (to fix Mac OS bugs) --- {{cookiecutter.repo_name}}/tests/README.rst | 31 +++++++++++++++++++ .../tests/hitchreqs.txt | 3 +- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 {{cookiecutter.repo_name}}/tests/README.rst diff --git a/{{cookiecutter.repo_name}}/tests/README.rst b/{{cookiecutter.repo_name}}/tests/README.rst new file mode 100644 index 000000000..b5403bfbc --- /dev/null +++ b/{{cookiecutter.repo_name}}/tests/README.rst @@ -0,0 +1,31 @@ +Hitch tests +=========== + +Note: This has been tested on up to date versions Debian, Ubuntu, Arch and +Mac OS X (Mavericks). + +To initialize and run the hitch tests in your project, enter this (tests) directory and +run the following command:: + + $ curl -sSL https://hitchtest.com/init.sh > init.sh ; chmod +x init.sh ; ./init.sh + +Note: if you are running Mac OS X you will need to install firefox as well. +You can do this while it is running. + +This should download install all the necessary packages and run the stub test. +It will take about 10 or 15 minutes to set up. + +Once it is ready, you should see a browser window and an interactive IPython prompt:: + + IPython 4.0.0 -- An enhanced Interactive Python. + ? -> Introduction and overview of IPython's features. + %quickref -> Quick reference. + help -> Python's own help system. + object? -> Details about 'object', use 'object??' for extra details. + + In [1]: + +For more documentation on hitch, see: https://hitchtest.readthedocs.org/en/latest/api/index.html + +If anything goes wrong during the set up process, please raise an issue at +https://github.com/hitchtest/hitch/issues diff --git a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt index 197264d66..a6125a695 100644 --- a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt +++ b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt @@ -38,5 +38,4 @@ six==1.9.0 tblib==1.1.0 tornado==4.2.1 traitlets==4.0.0 -unixpackage==0.3 -xeger==0.3 +unixpackage==0.3.2 From b85712396438e415fcc1dd543e03eb35a6365ce7 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 21:51:46 +0800 Subject: [PATCH 04/11] Make the Django tests send emails using the SMTP back end so that it can be interacted with via the test. --- {{cookiecutter.repo_name}}/tests/settings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.repo_name}}/tests/settings.yml b/{{cookiecutter.repo_name}}/tests/settings.yml index 655374ea9..c3b0c8e2f 100644 --- a/{{cookiecutter.repo_name}}/tests/settings.yml +++ b/{{cookiecutter.repo_name}}/tests/settings.yml @@ -9,6 +9,7 @@ environment_variables: DATABASE_URL: postgres://{{cookiecutter.repo_name}}:password@127.0.0.1:15432/{{cookiecutter.repo_name}} SECRET_KEY: cj5^uos4tfCdfghjkf5hq$9$(@-79^e9&x$3vyf#igvsfm4d=+ CELERY_BROKER_URL: redis://localhost:16379 + DJANGO_EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend window_size: width: 450 height: 450 From 0724c00f1dc3adae4c7e65cdf49c63c4717eaf2e Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 18:14:02 +0800 Subject: [PATCH 05/11] Updates to hitch framework - also removed parameterized tests via jinja2 - it's really an advanced feature. --- {{cookiecutter.repo_name}}/.gitignore | 1 + {{cookiecutter.repo_name}}/tests/base.yml | 4 ---- {{cookiecutter.repo_name}}/tests/engine.py | 12 ++++++++-- .../tests/hitchreqs.txt | 22 ++++++++++++++++--- {{cookiecutter.repo_name}}/tests/settings.yml | 21 ++---------------- {{cookiecutter.repo_name}}/tests/stub.test | 8 +------ 6 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 {{cookiecutter.repo_name}}/tests/base.yml diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.repo_name}}/.gitignore index 13567ebd0..884c920d1 100644 --- a/{{cookiecutter.repo_name}}/.gitignore +++ b/{{cookiecutter.repo_name}}/.gitignore @@ -55,3 +55,4 @@ node_modules/ # virtual environments .env +.hitch diff --git a/{{cookiecutter.repo_name}}/tests/base.yml b/{{cookiecutter.repo_name}}/tests/base.yml deleted file mode 100644 index 844f12712..000000000 --- a/{{cookiecutter.repo_name}}/tests/base.yml +++ /dev/null @@ -1,4 +0,0 @@ -{% raw %}{% for python_version in python_versions %} -{% block test scoped %} -{% endblock %} -{% endfor %}{% endraw %} diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index 388b08fde..fd818748c 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -45,12 +45,20 @@ class ExecutionEngine(hitchtest.ExecutionEngine): shutdown_timeout=5.0, ) - postgres_user = hitchpostgres.PostgresUser("{{cookiecutter.repo_name}}", "password") + postgres_user = hitchpostgres.PostgresUser( + "{{cookiecutter.repo_name}}", + "password" + ) self.services['Postgres'] = hitchpostgres.PostgresService( postgres_package=postgres_package, users=[postgres_user, ], - databases=[hitchpostgres.PostgresDatabase("{{cookiecutter.repo_name}}", postgres_user), ] + databases=[ + hitchpostgres.PostgresDatabase( + "{{cookiecutter.repo_name}}", + postgres_user + ), + ] ) self.services['HitchSMTP'] = hitchsmtp.HitchSMTPService(port=1025) diff --git a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt index ddb453bf8..197264d66 100644 --- a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt +++ b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt @@ -1,26 +1,42 @@ click==5.1 colorama==0.3.3 +decorator==4.0.2 +docopt==0.6.2 faketime==0.9.6.3 hitchcron==0.2 hitchpostgres==0.6.3 -hitchpython==0.3.5 +hitchpython==0.3.6 hitchredis==0.4.3 -hitchselenium==0.4.1 -hitchserve==0.4.4 +hitchselenium==0.4.3 +hitchserve==0.4.5 hitchsmtp==0.2.1 hitchtest==0.8.0 humanize==0.5.1 +ipykernel==4.0.3 ipython==4.0.0 +ipython-genutils==0.1.0 Jinja2==2.8 +jupyter-client==4.0.0 +jupyter-console==4.0.2 +jupyter-core==4.0.6 MarkupSafe==0.23 +path.py==8.1.1 patool==1.8 +pexpect==3.3 +pickleshare==0.5 psutil==3.2.1 +pykwalify==1.4.1 python-build==0.2.3 +python-dateutil==2.4.2 pyuv==1.2.0 PyYAML==3.11 +pyzmq==14.7.0 requests==2.7.0 selenium==2.47.3 +simplegeneric==0.8.1 six==1.9.0 tblib==1.1.0 tornado==4.2.1 +traitlets==4.0.0 +unixpackage==0.3 xeger==0.3 diff --git a/{{cookiecutter.repo_name}}/tests/settings.yml b/{{cookiecutter.repo_name}}/tests/settings.yml index 7ea14f07e..655374ea9 100644 --- a/{{cookiecutter.repo_name}}/tests/settings.yml +++ b/{{cookiecutter.repo_name}}/tests/settings.yml @@ -1,6 +1,6 @@ postgres_version: 9.3.9 redis_version: 2.8.4 -django_version: 1.8.3 +django_version: 1.8.4 celery_version: 3.1.18 pause_on_success: false pause_on_failure: true @@ -18,26 +18,11 @@ environment: - approved_platforms: - linux - darwin - - freeports: - - 1025 - - 8000 - - 15432 - - 16379 - - brew: - - libtool - - automake - - node - - debs: - - python-setuptools - - python3-dev - - python-virtualenv - - python-pip + - packages: - firefox - automake - libtool - - libreadline6 - libreadline6-dev - - libreadline-dev - libsqlite3-dev - libpq-dev - libxml2 @@ -55,5 +40,3 @@ environment: - libwebp-dev - zlib1g-dev - gettext - - python-dev - - build-essential diff --git a/{{cookiecutter.repo_name}}/tests/stub.test b/{{cookiecutter.repo_name}}/tests/stub.test index 88b4a1d0d..7772217d3 100644 --- a/{{cookiecutter.repo_name}}/tests/stub.test +++ b/{{cookiecutter.repo_name}}/tests/stub.test @@ -1,10 +1,4 @@ -{% raw %}{% extends "base.yml" %} -{% block test %} -- engine: engine.py:ExecutionEngine - name: Stub {{ python_version }} - preconditions: - python_version: "{{ python_version }}" +- name: Stub scenario: - Load website - Pause -{% endblock %}{% endraw %} From 3e8424175c69903029abda325c66c8bfe4b76bdd Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 18:18:52 +0800 Subject: [PATCH 06/11] Specify python version to test with in engine.py --- {{cookiecutter.repo_name}}/tests/engine.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index fd818748c..d3ce0b79b 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -18,9 +18,7 @@ class ExecutionEngine(hitchtest.ExecutionEngine): def set_up(self): """Ensure virtualenv present, then run all services.""" - python_package = hitchpython.PythonPackage( - python_version=self.preconditions['python_version'] - ) + python_package = hitchpython.PythonPackage("2.7.10") python_package.build() python_package.verify() From ba5dd0c5752959b802bb4e0af142f6599410550a Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 19:11:06 +0800 Subject: [PATCH 07/11] Added README just for tests and upgraded unixpackage (to fix Mac OS bugs) --- {{cookiecutter.repo_name}}/tests/README.rst | 31 +++++++++++++++++++ .../tests/hitchreqs.txt | 3 +- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 {{cookiecutter.repo_name}}/tests/README.rst diff --git a/{{cookiecutter.repo_name}}/tests/README.rst b/{{cookiecutter.repo_name}}/tests/README.rst new file mode 100644 index 000000000..b5403bfbc --- /dev/null +++ b/{{cookiecutter.repo_name}}/tests/README.rst @@ -0,0 +1,31 @@ +Hitch tests +=========== + +Note: This has been tested on up to date versions Debian, Ubuntu, Arch and +Mac OS X (Mavericks). + +To initialize and run the hitch tests in your project, enter this (tests) directory and +run the following command:: + + $ curl -sSL https://hitchtest.com/init.sh > init.sh ; chmod +x init.sh ; ./init.sh + +Note: if you are running Mac OS X you will need to install firefox as well. +You can do this while it is running. + +This should download install all the necessary packages and run the stub test. +It will take about 10 or 15 minutes to set up. + +Once it is ready, you should see a browser window and an interactive IPython prompt:: + + IPython 4.0.0 -- An enhanced Interactive Python. + ? -> Introduction and overview of IPython's features. + %quickref -> Quick reference. + help -> Python's own help system. + object? -> Details about 'object', use 'object??' for extra details. + + In [1]: + +For more documentation on hitch, see: https://hitchtest.readthedocs.org/en/latest/api/index.html + +If anything goes wrong during the set up process, please raise an issue at +https://github.com/hitchtest/hitch/issues diff --git a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt index 197264d66..a6125a695 100644 --- a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt +++ b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt @@ -38,5 +38,4 @@ six==1.9.0 tblib==1.1.0 tornado==4.2.1 traitlets==4.0.0 -unixpackage==0.3 -xeger==0.3 +unixpackage==0.3.2 From 333854c0e25729220b0a4180b7f3d9e3dc2c78c3 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Tue, 22 Sep 2015 21:51:46 +0800 Subject: [PATCH 08/11] Make the Django tests send emails using the SMTP back end so that it can be interacted with via the test. --- {{cookiecutter.repo_name}}/tests/settings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.repo_name}}/tests/settings.yml b/{{cookiecutter.repo_name}}/tests/settings.yml index 655374ea9..c3b0c8e2f 100644 --- a/{{cookiecutter.repo_name}}/tests/settings.yml +++ b/{{cookiecutter.repo_name}}/tests/settings.yml @@ -9,6 +9,7 @@ environment_variables: DATABASE_URL: postgres://{{cookiecutter.repo_name}}:password@127.0.0.1:15432/{{cookiecutter.repo_name}} SECRET_KEY: cj5^uos4tfCdfghjkf5hq$9$(@-79^e9&x$3vyf#igvsfm4d=+ CELERY_BROKER_URL: redis://localhost:16379 + DJANGO_EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend window_size: width: 450 height: 450 From 9d2635188d851b7045595a352b5c43c26211d28d Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Wed, 23 Sep 2015 11:41:27 +0800 Subject: [PATCH 09/11] Tests configured to run whichever version of python is selected by the user. --- {{cookiecutter.repo_name}}/tests/engine.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index d3ce0b79b..926f60963 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -18,7 +18,12 @@ class ExecutionEngine(hitchtest.ExecutionEngine): def set_up(self): """Ensure virtualenv present, then run all services.""" + {% if cookiecutter.use_python2 == 'n' -%} python_package = hitchpython.PythonPackage("2.7.10") + {% else %} + python_package = hitchpython.PythonPackage("3.5.0") + {%- endif %} + python_package.build() python_package.verify() From 6974d2ac794e0f5fc0cbace090832a187b1d76c2 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Wed, 23 Sep 2015 12:09:46 +0800 Subject: [PATCH 10/11] Fix for issue with templated python code in engine.py --- {{cookiecutter.repo_name}}/tests/engine.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index 926f60963..091eb7045 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -18,12 +18,11 @@ class ExecutionEngine(hitchtest.ExecutionEngine): def set_up(self): """Ensure virtualenv present, then run all services.""" - {% if cookiecutter.use_python2 == 'n' -%} + {% if cookiecutter.use_python2 == 'n' %} python_package = hitchpython.PythonPackage("2.7.10") {% else %} python_package = hitchpython.PythonPackage("3.5.0") - {%- endif %} - + {% endif %} python_package.build() python_package.verify() From 303986f333019b6aed1f44f832cc6e85a9a863b4 Mon Sep 17 00:00:00 2001 From: Colm O'Connor Date: Wed, 23 Sep 2015 12:15:01 +0800 Subject: [PATCH 11/11] Fixed whitespace issue --- {{cookiecutter.repo_name}}/tests/engine.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/tests/engine.py b/{{cookiecutter.repo_name}}/tests/engine.py index 091eb7045..36b8c0feb 100644 --- a/{{cookiecutter.repo_name}}/tests/engine.py +++ b/{{cookiecutter.repo_name}}/tests/engine.py @@ -18,11 +18,11 @@ class ExecutionEngine(hitchtest.ExecutionEngine): def set_up(self): """Ensure virtualenv present, then run all services.""" - {% if cookiecutter.use_python2 == 'n' %} + {% if cookiecutter.use_python2 == 'n' -%} python_package = hitchpython.PythonPackage("2.7.10") - {% else %} + {%- else -%} python_package = hitchpython.PythonPackage("3.5.0") - {% endif %} + {%- endif %} python_package.build() python_package.verify()