Merge bd6d97e into 2ba0515

.travis.yml

@@ -3,20 +3,20 @@ dist: trusty
 sudo: false
 language: python
 env:
-  - TOXENV=py27-django110-sqlite PYTHONPATH=$HOME/virtualenv/python2.7.13/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
-  - TOXENV=py27-django110-mysql PYTHONPATH=$HOME/virtualenv/python2.7.13/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
-  - TOXENV=py27-django110-postgres PYTHONPATH=$HOME/virtualenv/python2.7.13/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
+  - TOXENV=py27-django110-sqlite PYTHONPATH=$HOME/virtualenv/python2.7.14/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
+  - TOXENV=py27-django110-mysql PYTHONPATH=$HOME/virtualenv/python2.7.14/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
+  - TOXENV=py27-django110-postgres PYTHONPATH=$HOME/virtualenv/python2.7.14/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
   # Meta
-  - TOXENV=project PYTHONPATH=$HOME/virtualenv/python2.7.13/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
+  - TOXENV=project PYTHONPATH=$HOME/virtualenv/python2.7.14/lib/python2.7/site-packages  TOX_TESTENV_PASSENV="PYTHONPATH"
 cache:
   directories:
     - pootle/static/js/node_modules
     - pootle/assets
-    - $HOME/virtualenv/python2.7.13/bin
-    - $HOME/virtualenv/python2.7.13/lib
+    - $HOME/virtualenv/python2.7.14/bin
+    - $HOME/virtualenv/python2.7.14/lib
     - $HOME/virtualenv/python2.7/bin
 before_install:
-    - cp -a $HOME/virtualenv/python2.7.13/lib/python2.7/site-packages/ $HOME/py-workaround/
+    - cp -a $HOME/virtualenv/python2.7.14/lib/python2.7/site-packages/ $HOME/py-workaround/
 install:
   - if [[ ( "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "stable/*" || "$TRAVIS_BRANCH" == "requires-io-master" ) && "$TRAVIS_PULL_REQUEST" == "false" ]]; then upgrade="--upgrade"; fi;
       pip install 'setuptools>=18.5';
@@ -52,8 +52,8 @@ before_cache:
   # travis is so dumb - https://github.com/travis-ci/travis-ci/issues/4873
   - pip uninstall py pytest -y
   - pip install py==1.4.26 pytest==2.6.4
-  - pyclean $HOME/virtualenv/python2.7.13/lib/python2.7/site-packages/
-  - cp -a $HOME/py-workaround/* $HOME/virtualenv/python2.7.13/lib/python2.7/site-packages/
+  - pyclean $HOME/virtualenv/python2.7.14/lib/python2.7/site-packages/
+  - cp -a $HOME/py-workaround/* $HOME/virtualenv/python2.7.14/lib/python2.7/site-packages/
   # Force rebuilds by removing cache for 'master' and 'stable/*' builds
   - if [[ ( "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "stable/*" ) && "$TRAVIS_PULL_REQUEST" == "false" ]]; then rm -rf pootle/static/js/node_modules/* pootle/assets/* pootle/assets/.webassets-cache;  fi
 services:

Makefile

@@ -59,7 +59,7 @@ docs:
 	git submodule update --init
 	# The following creates the HTML docs.
 	# NOTE: cd and make must be in the same line.
-	cd ${DOCS_DIR}; make SPHINXOPTS="-T -W -q -j 4" html ${TAIL}
+	cd ${DOCS_DIR}; make SPHINXOPTS="-T -W -q " html ${TAIL}
 
 docs-review: docs
 	python -mwebbrowser file://$(shell pwd)/${DOCS_DIR}/_build/html/index.html
@@ -118,11 +118,11 @@ help:
 	@echo "Help"
 	@echo "----"
 	@echo
-	@echo "  assets - collect and rebuild the static assets"
-	@echo "  build - create sdist with required prep"
-	@echo "  docs - build Sphinx docs"
-	@echo "  docs-review - launch webbrowser to review docs"
-	@echo "  sprite - create CSS sprite"
-	@echo "  pot - update the POT translations templates"
-	@echo "  get-translations - retrieve Pootle translations from server (requires ssh config for pootletranslations)"
-	@echo "  linguas - update the LINGUAS file with languages over 80% complete"
+	@echo "	 assets - collect and rebuild the static assets"
+	@echo "	 build - create sdist with required prep"
+	@echo "	 docs - build Sphinx docs"
+	@echo "	 docs-review - launch webbrowser to review docs"
+	@echo "	 sprite - create CSS sprite"
+	@echo "	 pot - update the POT translations templates"
+	@echo "	 get-translations - retrieve Pootle translations from server (requires ssh config for pootletranslations)"
+	@echo "	 linguas - update the LINGUAS file with languages over 80% complete"

pytest_pootle/fixtures/debug.py

@@ -24,7 +24,7 @@ def memusage():
         dj_debug = importlib.import_module("dj.debug")
     except ImportError:
         return
-    return dj_debug.memusage
+    return getattr(dj_debug, 'memusage', None)
 
 
 @pytest.fixture(scope="session")

pytest_pootle/plugin.py

@@ -69,7 +69,7 @@ def pytest_runtest_setup(item):
     marker = item.get_marker("pootle_memusage")
     skip_memtests = (
         (marker is not None
-         and not item.config.getoption("--memusage"))
-        or not item._request.getfixturevalue("memusage"))
+         and not (item.config.getoption("--memusage")
+                  or not item._request.getfixturevalue("memusage"))))
     if skip_memtests:
         pytest.skip("test requires memusage flag and dj.debug.memusage")

requirements/_docs.txt

@@ -2,3 +2,4 @@
 
 readme_renderer==17.2
 Sphinx==1.6.3
+sphinx-bootstrap-theme

tests/import_export/export.py

@@ -13,35 +13,6 @@
 from import_export.utils import TPTMXExporter
 
 
-@pytest.mark.pootle_memusage
-@pytest.mark.django_db
-def test_view_tp_export_garbage(memusage, client,
-                                tp0, language1, request_users):
-    url = (
-        "%s?path=/%s/%s/"
-        % (reverse('pootle-export'),
-           tp0.language.code,
-           tp0.project.code))
-    user = request_users["user"]
-    client.login(
-        username=user.username,
-        password=request_users["password"])
-    client.get(url)
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(url)
-        assert not usage["used"]
-    url = (
-        "%s?path=/%s/%s/"
-        % (reverse('pootle-export'),
-           language1.code,
-           tp0.project.code))
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(url)
-        assert not usage["used"]
-
-
 @pytest.mark.django_db
 def test_download_exported_tmx(client, tp0):
     args = [tp0.language.code, tp0.project.code]

tests/pootle_app/views.py

@@ -71,19 +71,6 @@ def test_view_welcome(client, member, system, project_set):
                get_language())))
 
 
-@pytest.mark.pootle_memusage
-@pytest.mark.django_db
-def test_view_welcome_garbage(memusage, client):
-    url = reverse("pootle-home")
-    response = client.get(url)
-    response = client.get(url)
-    assert response.status_code == 200
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(url)
-        assert not usage["used"]
-
-
 @pytest.mark.django_db
 def test_view_index_redirect(client, language0, project0, request_users):
     user = request_users["user"]

tests/pootle_language/views.py

@@ -334,24 +334,3 @@ def test_view_language_children(language0, rf, request_users):
     view.object = view.get_object()
     assert view.object == language0
     _test_view_language_children(view, language0)
-
-
-@pytest.mark.pootle_memusage
-@pytest.mark.django_db
-def test_view_language_garbage(memusage, language0,
-                               store0, client, request_users):
-    url = reverse(
-        "pootle-language-browse",
-        kwargs=dict(
-            language_code=language0.code))
-    user = request_users["user"]
-    client.login(
-        username=user.username,
-        password=request_users["password"])
-    response = client.get(url)
-    response = client.get(url)
-    assert response.status_code == 200
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(url)
-        assert not usage["used"]

tests/pootle_profile/views.py

@@ -24,24 +24,3 @@ def test_view_user_detail(client, member, system):
     profile = response.context["profile"]
     assert isinstance(profile, UserProfile)
     assert profile.user == member
-
-
-@pytest.mark.pootle_memusage
-@pytest.mark.django_db
-def test_view_user_detail_garbage(memusage, member, client, request_users):
-    user = request_users["user"]
-    client.login(
-        username=user.username,
-        password=request_users["password"])
-    response = client.get(
-        reverse(
-            'pootle-user-profile',
-            kwargs=dict(username=member.username)))
-    assert response.status_code == 200
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(
-                reverse(
-                    'pootle-user-profile',
-                    kwargs=dict(username=member.username)))
-        assert usage["used"] == 0

tests/pootle_project/views.py

@@ -187,73 +187,6 @@ def test_view_project_paths(project0, store0, client, request_users):
     assert "store0.po" not in result["items"]["results"]
 
 
-@pytest.mark.pootle_memusage
-@pytest.mark.django_db
-def test_view_project_garbage(memusage, project0, client, request_users):
-    url = reverse(
-        "pootle-project-browse",
-        kwargs=dict(
-            project_code=project0.code,
-            dir_path="",
-            filename=""))
-    user = request_users["user"]
-    client.login(
-        username=user.username,
-        password=request_users["password"])
-    response = client.get(url)
-    response = client.get(url)
-    assert response.status_code == 200
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(url)
-        assert not usage["used"]
-
-
-@pytest.mark.pootle_memusage
-@pytest.mark.django_db
-def test_view_project_subdir_garbage(memusage, subdir0, client, request_users):
-    url = reverse(
-        "pootle-project-browse",
-        kwargs=dict(
-            project_code=subdir0.translation_project.project.code,
-            dir_path=subdir0.name,
-            filename=""))
-    url = "%s/" % url
-    user = request_users["user"]
-    client.login(
-        username=user.username,
-        password=request_users["password"])
-    response = client.get(url)
-    response = client.get(url)
-    assert response.status_code == 200
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(url)
-        assert not usage["used"]
-
-
-@pytest.mark.pootle_memusage
-@pytest.mark.django_db
-def test_view_project_store_garbage(memusage, store0, client, request_users):
-    url = reverse(
-        "pootle-project-browse",
-        kwargs=dict(
-            project_code=store0.translation_project.project.code,
-            dir_path="",
-            filename=store0.name))
-    user = request_users["user"]
-    client.login(
-        username=user.username,
-        password=request_users["password"])
-    response = client.get(url)
-    response = client.get(url)
-    assert response.status_code == 200
-    for i in xrange(0, 2):
-        with memusage() as usage:
-            client.get(url)
-        assert not usage["used"]
-
-
 @pytest.mark.django_db
 def test_view_projects_api(project0, client, request_users):
     user = request_users["user"]