[Python-modules-commits] r27091 - in packages/ipython/trunk/debian/patches (2 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Monday, January 6, 2014 @ 20:19:48
  Author: jtaylor-guest
Revision: 27091

fix a failing test due to static file separation

Added:
  packages/ipython/trunk/debian/patches/test-fix.patch
Modified:
  packages/ipython/trunk/debian/patches/series

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2014-01-06 20:19:45 UTC (rev 27090)
+++ packages/ipython/trunk/debian/patches/series	2014-01-06 20:19:48 UTC (rev 27091)
@@ -7,3 +7,4 @@
 parallel-2to3.patch
 shared-static-path.patch
 no-submodule-check.patch
+test-fix.patch

Added: packages/ipython/trunk/debian/patches/test-fix.patch
===================================================================
--- packages/ipython/trunk/debian/patches/test-fix.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/test-fix.patch	2014-01-06 20:19:48 UTC (rev 27091)
@@ -0,0 +1,13 @@
+--- a/IPython/core/tests/test_display.py
++++ b/IPython/core/tests/test_display.py
+@@ -48,7 +48,9 @@ def test_image_filename_defaults():
+     nt.assert_raises(ValueError, display.Image)
+     nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
+     from IPython.html import DEFAULT_STATIC_FILES_PATH
+-    imgfile = os.path.join(DEFAULT_STATIC_FILES_PATH, 'base/images/ipynblogo.png')
++    imgfile = os.path.join(tpath, 'html/static/base/images/ipynblogo.png')
++    if not os.path.exists(imgfile):
++        imgfile = os.path.join(DEFAULT_STATIC_FILES_PATH, 'base/images/ipynblogo.png')
+     img = display.Image(filename=imgfile)
+     nt.assert_equal('png', img.format)
+     nt.assert_is_not_none(img._repr_png_())