summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.testr.conf4
-rw-r--r--gitlab/tests/__init__.py0
-rw-r--r--test-requirements.txt3
-rw-r--r--tox.ini2
5 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2b88cf8..2227432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ MANIFEST
*.egg-info
.idea/
docs/_build
+.testrepository/
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..44644a6
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./gitlab/tests $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/gitlab/tests/__init__.py b/gitlab/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gitlab/tests/__init__.py
diff --git a/test-requirements.txt b/test-requirements.txt
index 33be0a7..0930bb8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,5 @@
+discover
+testrepository
hacking>=0.9.2,<0.10
+httmock
sphinx>=1.1.2,!=1.2.0,<1.3
diff --git a/tox.ini b/tox.ini
index 0abc937..ee0349b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
minversion = 1.6
skipsdist = True
-envlist = pep8
+envlist = py27,py34,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}