Merge pull request #153 from nephila/feature/tests_07

Tests update

tests/__init__.py

@@ -1,4 +1 @@
-# -*- coding: utf-8 -*-
-from .main import TestMain
-from .config import TestConfig
-from .django import TestDjango
+# -*- coding: utf-8 -*-

tests/base.py

@@ -41,11 +41,13 @@ def tearDown(self):
         self._remove_project_dir()
         self.stdout = None
         self.stderr = None
+        sys.path = self.syspath
 
     def setUp(self):
         self.stdout = StringIO()
         self.stderr = StringIO()
         self._create_project_dir()
+        self.syspath = sys.path
 
 
 class IsolatedTestClass(BaseTestClass):

tests/config.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
 import sys
-import tempfile
 
 from mock import patch
 from six import StringIO

tox.ini

@@ -4,6 +4,7 @@ envlist = py26, py27, py33, py34
 
 [testenv]
 recreate=True
+install_command = ./tox_pip.sh {opts} {packages}
 setenv =
     PYTHONPATH={toxinidir}:{toxinidir}/djangocms-installer
 commands = {env:COMMAND:python} setup.py test

tox_pip.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+pip install 'setuptools<8.0' 'pip<6'
+pip install $@