birkenfeld / sphinx-contrib / changeset / 3844cba2727d

Up to file-list feed/sphinxcontrib/feed/__init__.py:

@@ -37,7 +37,7 @@ def create_feed_container(app):
 def create_feed_item(app, pagename, templatename, ctx, doctree):
     """
     Here we have access to nice HTML fragments to use in, say, an RSS feed.
-    """
+    """
     import dateutil.parser
     date_parser = dateutil.parser.parser()
     env = app.builder.env
@@ -63,7 +63,6 @@ def create_feed_item(app, pagename, temp
     ctx['rss_link'] = app.config.feed_base_url + '/' + app.config.feed_filename
 def emit_feed(app, exc):
     assert False
     import os.path
     ordered_items = app.builder.env.feed_items.values()
     feed = app.builder.env.feed_feed
@@ -72,10 +71,9 @@ def emit_feed(app, exc):
       reverse=True)
     for item in ordered_items:
         feed.add_item(**item)
-    outfilename = os.path.join(app.builder.outdir, 'html',
+    outfilename = os.path.join(app.builder.outdir,
       app.config.feed_filename)
     fp = open(outfilename, 'w')
     assert False
     feed.write(fp, 'utf-8')
     fp.close()

Up to file-list feed/tests/assert_operators.py:

 """
 Look away! this just turns the operators in the operator modules into
 functions of the same name that assert their own truth. Codegen FTW.
 This uses the exec function, which is insane and ugly. but types.FunctionTpe/types.CodeType is insane, ugly, AND very tedious
 """
 import operator
 from string import Template
 INTERESTING_OPS = [
 'and_',
 'contains',
 'eq',
 'ge',
 'gt',
 'isCallable',
 'isMappingType',
 'isNumberType',
 'isSequenceType',
 'is_',
 'is_not',
 'le',
 'lt',
 'ne',
 'not_',
 'or_',
 'repeat',
 'sequenceIncludes',
 'truth']
 FUNCTION_TEMPLATE = Template("""
 def $op_name(*args, **kwargs):
     assert operator.$op_name(*args, **kwargs)
 """)
 for op_name in INTERESTING_OPS:
     exec(FUNCTION_TEMPLATE.substitute(op_name=op_name))

Up to file-list feed/tests/run.py:

 import sys
 from os import path
 # always test the FeedBuilder package from this directory
 sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
 def run(bonus_args=[]):
     # always test the FeedBuilder package from this directory
     sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
 try:
     import nose
 except ImportError:
     print "The nose package is needed to run the FeedBuilder test suite."
-    sys.exit(1)
+    try:
         import nose
     except ImportError:
         print "The nose package is needed to run the FeedBuilder test suite."
         sys.exit(1)
 nose_argv = ['nosetests']
 # Everything after '--' is passed to nose.
 if '--' in sys.argv:
     hyphen_pos = sys.argv.index('--')
-    nose_argv.extend(sys.argv[hyphen_pos + 1:])
+    try:
         import sphinx
     except ImportError:
         print "The sphinx package is needed to run the FeedBuilder test suite."
 nose.run(argv=nose_argv)
     nose_argv = ['nosetests']
 print "Running FeedBuilder test suite..."
 nose.run()
     # Everything after '--' is passed to nose.
     if '--' in sys.argv:
         hyphen_pos = sys.argv.index('--')
         nose_argv.extend(bonus_args + sys.argv[hyphen_pos + 1:])
     print "Running FeedBuilder test suite..."
     nose.run(argv=nose_argv)
 if __name__ == '__main__':
     run()

Up to file-list feed/tests/test_build.py:

 """
 import os
 from os.path import exists
 import re
 import sys
 import difflib
 import htmlentitydefs
 from StringIO import StringIO
 from operator import eq, truth
 from tests.util import test_root, raises, raises_msg, Struct,\
 import assert_operators as ops
 from util import test_root, raises, raises_msg, Struct,\
   ListOutput, TestApp, with_app, gen_with_app, path, with_tempdir,\
   write_file, sprint
@@ -39,29 +40,25 @@ FEED_WARNINGS = ENV_WARNINGS + ""
 # %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.*'
 # """
 @gen_with_app(buildername='html', warning=feed_warnfile, cleanenv=True,
               tags=['testtag'])
 def exists(p):
     assert os.path.exists(p)
 @gen_with_app(buildername='html', warning=feed_warnfile, cleanenv=True)
 def test_feed(app):
-    app.builder.build_all()
+    app.build(all_files=True, filenames=[]) #build_all misses the crucial finish signal
     feed_warnings = feed_warnfile.getvalue().replace(os.sep, '/')
     feed_warnings_exp = FEED_WARNINGS % {'root': app.srcdir}
     # yield eq, feed_warnings, feed_warnings_exp, 'Warnings don\'t match:\n' + \
     #        '\n'.join(difflib.ndiff(feed_warnings_exp.splitlines(),
     #                                feed_warnings.splitlines()))
     yield eq, feed_warnings, feed_warnings_exp
-    assert feed_warnings == feed_warnings_exp
+    yield ops.eq, feed_warnings, feed_warnings_exp
     rss_path = os.path.join(app.outdir, 'rss.xml')
     yield os.path.exists, rss_path
     assert os.path.exists(rss_path)
     yield exists, rss_path
     yield ops.eq, app.builder.env.feed_items.keys(), ['older', 'most_aged', 'latest']
     # see http://www.feedparser.org/
     f = feedparser.parse(rss_path)
     assert False
     entries = f.entries
     yield eq, len(entries), 3
     yield eq, entries[0].updated_parsed, (2001, 8, 11)
     yield eq, entries[0].title, "The latest blog post"
     yield eq, entries[1].updated_parsed, (2001, 8, 1)
     yield eq, entries[1].title, "An older blog post"
     yield eq, entries[2].updated_parsed, (1979, 1, 1)
-    yield eq, entries[2].title, "The oldest blog post"
+    yield ops.eq, entries[0].updated_parsed, (2001, 8, 11)
     yield ops.eq, entries[0].title, "The latest blog post"
     yield ops.eq, entries[1].updated_parsed, (2001, 8, 1)
     yield ops.eq, entries[1].title, "An older blog post"
     yield ops.eq, entries[2].updated_parsed, (1979, 1, 1)
     yield ops.eq, entries[2].title, "The oldest blog post"

Up to file-list feed/tests/util.py:

@@ -24,8 +24,6 @@ from sphinx.ext.autodoc import AutoDirec
 from path import path
 import nose.tools
 __all__ = [
     'test_root',
     'raises', 'raises_msg', 'Struct',
@@ -88,7 +86,6 @@ class ListOutput(object):
     def write(self, text):
         self.content.append(text)
 @nose.tools.nottest
 class TestApp(application.Sphinx):
     """
     A subclass of :class:`Sphinx` that runs on the test root, with some

commit 96:	3844cba2727d
parent 95:	5ed5ecc481bb
branch:	default

birkenfeld / sphinx-contrib (http://sphinx.pocoo.org/)