allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [allura] branch master updated: [#8320] more precise fix for [ca941a3] that works without html2text pkg installed
Date Mon, 05 Aug 2019 19:06:14 GMT
This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/master by this push:
     new 21bf8f2  [#8320] more precise fix for [ca941a3] that works without html2text pkg
installed
21bf8f2 is described below

commit 21bf8f2bb719e7f0b6fbc157423b7109da1b7a0d
Author: Dave Brondsema <dave@brondsema.net>
AuthorDate: Mon Aug 5 15:06:01 2019 -0400

    [#8320] more precise fix for [ca941a3] that works without html2text pkg installed
---
 ForgeBlog/forgeblog/tests/test_commands.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ForgeBlog/forgeblog/tests/test_commands.py b/ForgeBlog/forgeblog/tests/test_commands.py
index 03b382a..405b4a2 100644
--- a/ForgeBlog/forgeblog/tests/test_commands.py
+++ b/ForgeBlog/forgeblog/tests/test_commands.py
@@ -28,7 +28,6 @@ from ming.orm.ormsession import ThreadLocalORMSession
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura import model as M
 from forgeblog import model as BM
-from forgeblog.command import rssfeeds  # note that importing this sets html2text.BODY_WIDTH
to a new value
 
 test_config = pkg_resources.resource_filename(
     'allura', '../test.ini') + '#main'
@@ -114,6 +113,7 @@ def test_pull_rss_feeds(parsefeed):
     BM.Globals(app_config_id=tmp_app._id, external_feeds=new_external_feeds)
     ThreadLocalORMSession.flush_all()
 
+    from forgeblog.command import rssfeeds  # importing this sets html2text.BODY_WIDTH to
a value this test expects
     cmd = rssfeeds.RssFeedsCommand('pull-rss-feeds')
     cmd.run([test_config, '-a', tmp_app._id])
     cmd.command()
@@ -134,6 +134,7 @@ def test_pull_rss_feeds(parsefeed):
 
 @skipif(module_not_available('html2text'))
 def test_plaintext_preprocessor():
+    from forgeblog.command import rssfeeds  # importing this sets html2text.BODY_WIDTH to
a value this test expects
     from html2text import html2text
     text = html2text(
         "[plain]1. foo[/plain]\n"
@@ -155,6 +156,7 @@ def test_plaintext_preprocessor():
 
 @skipif(module_not_available('html2text'))
 def test_plaintext_preprocessor_wrapped():
+    from forgeblog.command import rssfeeds  # importing this sets html2text.BODY_WIDTH to
a value this test expects
     from html2text import html2text
     text = html2text(
         "<p>[plain]1. foo[/plain]</p>\n"


Mime
View raw message