Merge 1210192 into e8af464

.gitignore

@@ -1,27 +1,17 @@
 *.py[co]
+.DS_Store
 
 # Packages
 *.egg
 *.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-
-# Installer logs
-pip-log.txt
+dist/
+build/
+.eggs/
 
 # Unit test / coverage reports
+.cache/
 .coverage
 .noseids
-velo/.noseids
-velo/coverage.xml
-velo/tests/.noseids
-velo/tests/coverage.xml
 coverage.xml
 nosetests.xml
-.DS_Store
 .coveralls.yml

requirements-test.txt

@@ -1,17 +1,19 @@
 # build deps
 d2to1
+docutils
 
 # test deps
 coverage
+coveralls
 mock
 nose
 nosexcover
+pytest
 webtest
-coveralls
 
 pymongo < 3.0
 pyramid_mongokit >= 0.2
 voluptuous
 sqlalchemy >= 0.9
 alembic
-mysql-connector-python
+https://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df

royal/tests/functional/test_example.py

@@ -74,10 +74,8 @@ def test_post_photo(self):
         self.assertIn('Content-Type', headers)
         self.assertIn('Location', headers)
 
-        self.assertEqual('application/json; charset=UTF-8',
-                         headers['Content-Type'])
-        self.assertEqual(location,
-                         headers['Location'])
+        self.assertEqual('application/json', headers['Content-Type'])
+        self.assertEqual(location, headers['Location'])
 
         expected = {
             'href': location,

tox.ini

@@ -0,0 +1,21 @@
+[tox]
+# Bare `tox` runs this testenv
+envlist = py27-quick
+
+[pytest]
+addopts = -svv
+# Bare `pytest` only runs unittests
+testpaths = royal/tests/unittests
+norecursedirs =
+    .tox
+    __pycache__
+    example
+    docs
+
+[testenv]
+deps = -rrequirements-test.txt
+# Configure py*-quick to run unittests and py*-all to run all tests
+commands =
+    python -c "import sys; print(sys.version)"
+    all: pytest royal
+    quick: pytest