summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--sleekxmpp/test/sleektest.py3
-rw-r--r--tox.ini5
3 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 986d7218..9b7733be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ dist/
MANIFEST
docs/_build/
*.swp
+.tox/
+.coverage
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index bfc5a722..0f35e28c 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -58,9 +58,6 @@ class SleekTest(unittest.TestCase):
unittest.TestCase.__init__(self, *args, **kwargs)
self.xmpp = None
- def runTest(self):
- pass
-
def parse_xml(self, xml_string):
try:
xml = ET.fromstring(xml_string)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..8576f4eb
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,5 @@
+[tox]
+envlist = py26,py27,py31,py32
+[testenv]
+deps = nose
+commands = nosetests --where=tests --exclude=live -i sleektest.py