From 0724c00f1dc3adae4c7e65cdf49c63c4717eaf2e Mon Sep 17 00:00:00 2001
From: Colm O'Connor <colm.oconnor.github@gmail.com>
Date: Tue, 22 Sep 2015 18:14:02 +0800
Subject: [PATCH] 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 %}