Merge pull request #70 from plone/mailhost-410

Fixed test failure on Python 3 with Products.MailHost 4.10.
plone · Sep 25, 2020 · a7e7b39 · a7e7b39
2 parents 840bb68 + 09097ea
commit a7e7b39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/news/3178.bugfix b/news/3178.bugfix
@@ -0,0 +1,2 @@
+Fixed test failure on Python 3 with Products.MailHost 4.10.
+[maurits]
diff --git a/src/plone/app/testing/layers.rst b/src/plone/app/testing/layers.rst
@@ -440,7 +440,7 @@ If we send a message, we can check it in the list:
     ...     )
     >>> with helpers.ploneSite() as portal:
     ...     for message in portal.MailHost.messages:
-    ...         print(message)
+    ...         print(message.decode("utf-8"))
     MIME-Version: 1.0
     Content-Type: text/plain
     Subject: Test

diff --git a/tox.ini b/tox.ini
@@ -59,7 +59,7 @@ commands =
 skip_install = true
 
 deps =
-    isort
+    isort < 5
     flake8
     # helper to generate HTML reports:
     flake8-html
@@ -87,7 +87,7 @@ deps =
 commands =
     mkdir -p {toxinidir}/_build/reports/flake8
     - flake8 --format=html --htmldir={toxinidir}/_build/reports/flake8 --doctests src setup.py
-    flake8 --doctests src tests setup.py
+    flake8 --doctests src setup.py
     isort --check-only --recursive {toxinidir}/src
 
 whitelist_externals =
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fixed test failure on Python 3 with Products.MailHost 4.10.
		[maurits]