summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--tox.ini15
2 files changed, 20 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3dd732a8..68398d68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,15 @@
# Linux swap files range from .saa to .swp
*.s[a-w][a-p]
-# Python bytecode files
+# Python bytecode and other related temp files
*.pyc
*.pyo
+*egg-info
# Development environment files
.project
.pydevproject
+
+# Cache files
+.cache
+.pytest_cache
diff --git a/tox.ini b/tox.ini
index 460066d9..87f64768 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,13 +6,26 @@ envlist = pep8
[testenv]
basepython = python2.7
setenv = VIRTUAL_ENV={envdir}
-whitelist_externals = find
+whitelist_externals = *
commands = find . -type f -name "*.py[c|o]" -delete
[testenv:pep8]
deps = -r{toxinidir}/test-requirements.txt
commands = flake8 {posargs}
+[testenv:functional]
+deps =
+ rtyaml
+ ddt
+ git+git://github.com/loadtheaccumulator/glusto.git
+ git+git://github.com/gluster/glusto-tests.git#egg=glustolibs-gluster&subdirectory=glustolibs-gluster
+ git+git://github.com/gluster/glusto-tests.git#egg=glustolibs-io&subdirectory=glustolibs-io
+ git+git://github.com/gluster/glusto-tests.git#egg=glustolibs-misc&subdirectory=glustolibs-misc
+ --editable=file:///{toxinidir}/cns-libs
+commands =
+ find . -type f -name "*.py[c|o]" -delete
+ {posargs:bash -c "echo 'No commands have been specified. Exiting.'; exit 1"}
+
[testenv:venv]
commands = {posargs}