Skip to content
Permalink
Browse files

Fixes test suite (#6688)

* add information for testing

* fix tests

* updated CHANGELOG

* update

* 1.8.5

* fix tests locally

* update text
  • Loading branch information...
FinalAngel committed Jun 7, 2019
1 parent b810dd4 commit 006367b6787b1ec884c1e5423a0cfc1a53305328
@@ -23,6 +23,7 @@ dist
.project
.coverage
.pydevproject
.vscode
.settings
/*.egg-info/
/*.egg/
@@ -146,5 +146,3 @@ notifications:
irc:
- irc.freenode.org#django-cms
- irc.freenode.org#django-cms-sprint
webhooks:
- http://addons.us-iad-rs.aldryn.io/en/travis-endpoint/
@@ -1,6 +1,7 @@
=== 3.7.0 (unreleased) ===

* Introduced Django 2.2 support.
* Fixed test suite.


=== 3.6.0 (2019-01-29) ===
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
import sys
import mock

from django.contrib.admin.models import CHANGE, LogEntry
from django.contrib.auth import get_user_model
@@ -855,7 +856,8 @@ def test_get_menus(self):

request = self.get_request('/')
renderer = menu_pool.get_renderer(request)
nodes = renderer.get_nodes()
with mock.patch("menus.menu_pool.logger.error"):
nodes = renderer.get_nodes()
nodes_urls = [node.url for node in nodes]
self.assertTrue(reverse('sample-account') in nodes_urls)
self.assertFalse('/en/child_page/page2/' in nodes_urls)
@@ -7,7 +7,8 @@
import sys

from django.utils.six.moves import StringIO
from sphinx.application import Sphinx, SphinxWarning
from sphinx.application import Sphinx
from sphinx.errors import SphinxWarning

try:
import enchant
@@ -65,9 +65,7 @@ We are working to improve the performance and reliability of our test suite. We'
problems, but need feedback from people using a wide range of systems and configurations in order
to benefit from their experience.

Please use the open issue `#3684 Test suite is error-prone
<https://github.com/divio/django-cms/issues/3684>`_ on our GitHub repository to report such
problems.
Please report any issues on our `GitHub repository <https://github.com/divio/django-cms/issues>`_.

If you can help *improve* the test suite, your input will be especially valuable.

@@ -96,6 +94,14 @@ when the entire suite is run. To work around this you can invoke the test class
and it should then run without errors.


``ERROR: zlib is required unless explicitly disabled using --disable-zlib, aborting``
------------------------------------------------------------------------------------------

If you run into that issue, make sure to install zlib using Homebrew::

brew install libjpeg zlib && brew link --force zlib


Advanced testing options
========================

@@ -221,33 +221,34 @@ add a text plugin with the content ``'hello world'``. This is done in English::
cms.constants
*************

.. module:: cms.constants
.. module:: cms.constants
.. data:: TEMPLATE_INHERITANCE_MAGIC
.. data:: TEMPLATE_INHERITANCE_MAGIC
The token used to identify when a user selects "inherit" as template for a
page.
.. data:: LEFT
.. data:: LEFT
Used as a position indicator in the toolbar.
.. data:: RIGHT
.. data:: RIGHT
Used as a position indicator in the toolbar.
.. data:: REFRESH
.. data:: REFRESH
Constant used by the toolbar.
.. data:: EXPIRE_NOW
.. data:: EXPIRE_NOW
Constant of 0 (zero) used for cache control headers
.. data:: MAX_EXPIRATION_TTL
.. data:: MAX_EXPIRATION_TTL
Constant of 31536000 or 365 days in seconds used for cache control headers
************
cms.app_base
************
@@ -380,6 +380,7 @@ django CMS constants used in toolbars
*************************************

.. module:: cms.constants
:noindex:
.. data:: REFRESH_PAGE
@@ -1,4 +1,3 @@
-f http://simple.crate.io/
MarkupSafe==0.23
Pygments==2.0.2
sphinx
@@ -15,6 +15,7 @@ Improvements and new features
=============================

* introduced support for Django 2.2
* Fixed test suite.


*********************
@@ -1,7 +1,7 @@
coverage==4.2
python-coveralls==2.5.0
unittest-xml-reporting==1.11.0
Pillow==3.3.2
Pillow==5.2.0
django-treebeard>=4.3
argparse
dj-database-url
@@ -12,7 +12,7 @@ https://github.com/divio/djangocms-text-ckeditor/archive/master.zip
https://github.com/ojii/django-better-test/archive/8aa2407d097fe3789b74682f0e6bd7d15d449416.zip#egg=django-better-test
https://github.com/ojii/django-app-manage/archive/65da18ef234a4e985710c2c0ec760023695b40fe.zip#egg=django-app-manage
iptools
sphinx==1.4.5
sphinx==1.8.5
sphinxcontrib-spelling
pyflakes==1.1.0
pyenchant

0 comments on commit 006367b

Please sign in to comment.
You can’t perform that action at this time.