Follow up to PR #341 integrate functional tests

README.md

@@ -321,7 +321,7 @@ The same rule applies for the end of a file and for files with only one line.
 Unit tests can be run with
 
 ```bash
-nosetests tests/
+nosetests
 ```
 
 Functional tests, which take longer, can be run with
@@ -334,12 +334,6 @@ Then make a cup of tea while all of those tests run. It takes a while. If you
 have more than two cores on your machine or you don't mind pwnage, you can try
 to increase the number of parallel processes used for testing.
 
-If you just want to run all the tests at once, run
-
-```bash
-nosetests --processes=2
-```
-
 
 ## Updating
 

functional_tests/test_validator.py

@@ -14,9 +14,6 @@
 
 
 def _validator(file_path, for_appversions=None, overrides=None):
-    # TODO(Kumar) This is currently copied from Zamboni because
-    # it's really hard to import from zamboni outside of itself.
-    # TODO(Kumar) remove this when validator is fixed, see bug 620503
     from validator.testcases import scripting
     import validator
     import validator.constants

setup.cfg

@@ -0,0 +1,4 @@
+[nosetests]
+# The following will be overriden by the command-line if explicitely running
+# those tests, eg nosetests functional_tests/.
+exclude=^functional_tests/*

tox.ini

@@ -12,4 +12,6 @@ commands =
 
 [testenv:functional-tests]
 commands =
-    nosetests --with-xunit functional_tests/
+    git submodule sync -q
+    git submodule update --init
+    nosetests --with-xunit --processes=2 functional_tests/