Fix travis tests

Author: vmalloc

.gitignore

@@ -5,4 +5,5 @@ build
 .tox
 flycheck-*
 dist
-.env
+.env
+.cache

Makefile

@@ -4,7 +4,7 @@ test: env
 	.env/bin/py.test -x tests
 
 travis_test: env
-	.env/bin/py.test
+	PYTHONPATH=.env/mailboxer .env/bin/py.test
 
 env: .env/.up-to-date
 
@@ -15,7 +15,6 @@ env: .env/.up-to-date
 	.env/bin/pip install -r ./mailboxer_python.egg-info/requires.txt
 	.env/bin/pip install pytest Flask-Loopback
 	test -d .env/mailboxer || git clone https://github.com/vmalloc/mailboxer .env/mailboxer
-	.env/bin/pip install -r .env/mailboxer/base_requirements.txt
-	.env/bin/pip install -r .env/mailboxer/flask_app/pip_requirements.txt
+	.env/bin/pip install -r .env/mailboxer/deps/base.txt -r .env/mailboxer/deps/develop.txt -r .env/mailboxer/deps/app.txt
 	touch $@
 

tests/conftest.py

@@ -14,7 +14,7 @@
 sys.path.insert(0, os.path.join(
     os.path.abspath(os.path.dirname(__file__)),
     "..", ".env", "mailboxer"))
-from flask_app.app import app
+from flask_app.app import create_app
 from flask_app import models
 
 def pytest_addoption(parser):
@@ -26,21 +26,23 @@ def db_engine(request):
         tmpdir = tempfile.mkdtemp()
         subprocess.check_call("pg_ctl init -D {0} -w".format(tmpdir), shell=True)
         subprocess.check_call("pg_ctl start -D {0} -w".format(tmpdir), shell=True)
+
         @request.addfinalizer
         def finalize():
             subprocess.check_call("pg_ctl stop -D {0} -w -m immediate".format(tmpdir), shell=True)
             shutil.rmtree(tmpdir)
 
         subprocess.check_call("createdb mailboxer", shell=True)
 
-    models.db.session.close()
-    models.db.drop_all()
-    models.db.create_all()
+    with create_app().app_context():
+        models.db.session.close()
+        models.db.drop_all()
+        models.db.create_all()
 
 
 @pytest.fixture(scope="session")
 def mailboxer_url(request, db_engine):
-    loopback = FlaskLoopback(app)
+    loopback = FlaskLoopback(create_app())
     hostname = str(uuid.uuid1())
     loopback.activate_address((hostname, 80))
     @request.addfinalizer