From 2ea353bce0b016f18f4be1aeec1ea2ac9f5cc7ef Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 30 Jul 2013 14:31:29 -0400 Subject: [PATCH] test_python.py was still broken - actually fix it - refs #1513 --- .../images/python-Format-reference.png | Bin 0 -> 1580 bytes .../images/python-IfElse-reference.png | Bin 0 -> 1739 bytes .../images/python-List-reference.png | Bin 0 -> 2862 bytes .../images/python-MyText-reference.png | Bin 0 -> 2416 bytes .../images/python-TextNode-reference.png | Bin 0 -> 1587 bytes tests/visual_tests/test_python.py | 16 +++++++++------- 6 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 tests/visual_tests/images/python-Format-reference.png create mode 100644 tests/visual_tests/images/python-IfElse-reference.png create mode 100644 tests/visual_tests/images/python-List-reference.png create mode 100644 tests/visual_tests/images/python-MyText-reference.png create mode 100644 tests/visual_tests/images/python-TextNode-reference.png diff --git a/tests/visual_tests/images/python-Format-reference.png b/tests/visual_tests/images/python-Format-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..95a0eea9fdf7aa6af570983dea5c0c83716a8333 GIT binary patch literal 1580 zcmd6n|2q>19LJ{~R2~mqz8#frC)b#?YS&{O&qJIW=36#9DTTtm$qh@HX?GM(v$QQ5 z%hzgV%!tKS3Hi3Av@PFSUo6!OZJHvS=jplUp8E^#etEw>zrEhi=ZAM*Xt2NeCi_hQ z0Kgpni*GmpunxU;$8T7_mUxb2^BS0;K@omyH2K}c;(~>3fvrQKgCormNC!F>JG(Mm z-C6E?OZGxbp&o1x&vH-i>)!rV{_tuzq81T$D-2bKisnb3XgrZ1Ou)8alUtLCB4S#5 z8d*Z7-lyh1$j$4{qdlb2d+DqJR>@#VnXIgKxRxvD@|Aqyh)^^xlBgt|FFSi)_YA%n zRA>}q+A+0GJ#Cm?U0uZ;l==Vw#$j+@?}#&OZAsp5l|fcHTZ-E%Hd9SHv?3M^)`jV~Ibv(ec(LUbNya}24pLt#r11oJ4NtS-Rw?V^HRFM7crfwH@G_$5V?_{sQKg+2*)?ni+(oNrg&8Y!=-(!?cwQ?2d3 zW4v_g$>l<0tCL==6H1GjvxpL%Q%Deu@ zXT$*oeNng5nZjRx4yRxlZ6wY2^l{k69RC0d-IcmYDvXrcWZ^V^9Q2eon(nf2RX~1xyau=UEi5<)xfOiO^`z-`iqZUolNQbGf^xJ4yQa$GqV|B z_3Cm#-NRoST~=>P*l)g@8&*{lE!P?3TqB4jSw$%-kS?MIQ+rV$Ch4R3B|XIY2&@CB z7@}30LY~)f8W`(E%BslE5qI33TSTV&^4T@Xf7C<PpJZ@bmz!&_QJCE0Yu^m#QX<3;8Ja@15iGZl*#KkKoFM)f1zl4I)aE!WQ?Byo78 z3ZtsT2$A_#no$Q{PXzAWTt1rQ`Y^@!yT3FT}nfsI| zTJqAKkhauzr&tcS1%*gpl9$CW~f65 z$XVIn@{EZ|98%RBi){M0`pwiiAswuzouwJ={2i#`Nm5wE*YFSijh4$lMG~|XtB}m< z-W^eACN#3xTO$o|uq%Orh-kx&5g_X1eGz)TEi);Ke;cN1>4>+pcuy#j)Y^GYVY;|H zl=($(Ltz;YT=`-8P}cEpr5A1hV-Of((!Qu5+RS{$ z)*=1=r4`rK`}Nl)ne^tukylihCJ+ogf@^1}$US1akPx?6qz$i2M+iZDee;1!Z$l%w z4WLe$$X>v$lbUvAvjv|!+-Dj~-xaNiv4qoJ3NX_r{!w%Dd}`n-8@J;i>M2E;494GF zx)mR;YbPvT#&PdLKB<=%=3;}N quY81N8VRyCvsNFOI{rtav}$y^8qD6BDUMs4eE{4q*q85focb5hY~@7& literal 0 HcmV?d00001 diff --git a/tests/visual_tests/images/python-IfElse-reference.png b/tests/visual_tests/images/python-IfElse-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..d71da4f856195b2c9d78bac1e4ab7ebda0aa3d2c GIT binary patch literal 1739 zcmd6o?LQL;0LMwAt8f%b9!e)yV`7Pka2^&laoE;avarHdVn;J6U22{dpQJTTt)m;_ z)=t7q*>J?1V;IfyFco9h#I~@V7x&`+gS$81@9*{R#qUQB35M!#HQ%bGrKKNu!tZ-6 ztxd>{9J@tlgSZNg(S|BRPKEn#SXWoq(9qDx$jHphY|oxOR#sLvHZ}(i8~_4=j*gDb z&dx3_E)WRB)6>((#|H|91_lPgV6f28P&gbO6%`c|6NANK6B85hczjAq3V}c%kx1Fu z**Q5mWHOmTp%fJrm6n!LsnqiFayp$}RaI48U0qjK$6~RXnwmHqPJ4TMXJ=!lgGWom#tTY13+0YSM zbZ@48kag#hyF-7=FK_0&##`jYo$GN|6A8^fd0d2Xk1LK{d)l@B!mf}jofu_hCSR;R z`kvG5M}Y`$E%Y>9&l;Lq6C?zD@l`m8lv85}T$^f>M*c0Sm<&|mya0>RScUIyqyg5Z zdD}YgRJ`*_Z27?D{h!m;xwXb1h}rnL{%PCOrc-y-lR4}&=NBB@XwPy^_0QoLpH*Qm zLnRL`%*59i6bIuNml#7&ul#AOlF83u*tAI zM(t3}=w%sS+97ZShtXfuJ)aO~-Y7lP8UI`gILJJnF;3<#Nbr23kNu`66D#XC+Zy51 zh1A~q@duYs;}L0%6SxFsdi$M)QAzO4tS`N&+JxPTA~svuO`#>rkK|Jy3Rdr(6nk~) zMJ)a?>0$BaW^CD~M=h~I_A9(KpPkRreW^ejQTklT4xj)8nOP(WCl>@Th&#&b6FSn6 z@TR^VuJ@oLAvD}1uOt%;woRBnw79mojUDEMUco5tA(t<(7|&;CQaK0|=5w#O1M#ur z)a)?YjRrfMFI7$jcbmUmv=&dPyxF?>J@0KJoLqy>@>#@4P&wiy2+JdO;|08{>USIg zqkyNA?6zH*N34-^c~i9syz1EZvoB8SqbK2_HU}t_d$$GbIpomBL0O&~9=V;4DIkcQ ztwX5|1e1Nkt!BusRAHVd3=^@ocMH;Z6dl$?SGPLGp*^XQX=A2?M$s#Y1O5A7Hl<<* z%`3JZth(rQWof3R{YXfpOXAAG5)dCz3dTq{bmeW^6sQk^X4Vr%)~hKqcw{inU)5<1`tdoyhf+DxMJl@ zElN1nmP_aY3^V63mbk8ua(I8TvPx*wCw3(+H!$k$Qs(8M)6ZJV8dm#EWQ~$1-bn~b ze%@_;g_J+8e|51DNgPgkQ;Fb9bbn~1*}FqPJfAM&f&>%(y?Rk zYIMSfYc8&&A^~H~VsKo=9owG53#x|$9(3HS8mxE-ti=WmsUvDLK)>di-^11)>{n=XVT)52=jt&W{( ztK2!lf5@pk+K)F^%hig*mr>T5We7=!skXsuDh%EKqlr{&hlJ9Z=;<5j8?U4l=pXD? J_uaYdzX3zP947z( literal 0 HcmV?d00001 diff --git a/tests/visual_tests/images/python-List-reference.png b/tests/visual_tests/images/python-List-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..2be43fc4f9b341517e52cafc6edcb17b52ad7b56 GIT binary patch literal 2862 zcmd6p`BxHX7sqY0NyjWLEpZubT*`$R4IS5V*Aj6_A`Nq?P)V_rw8R!llhn*HV_eYC zaY+FikxCFu8>}>K43|i;T(Ar@71Lawp*iP$&-?-J5ASo%z2~_Wn zCIkY})6+9BFfcMQGBq`YLZOzHmM|F1*4Eb1(NQx~6Os*ac6Qdw(ew25^!E0K!{Ph# z_gRoF{Qdncf3rj)k+32d*u2@c*!KAGkT_wU|% zdH`Mt$6~QSU*Et0_*MJia5!LWY-$RCnOQL`M*&zYiBF=audk2K2Y}BP3WXw( zsIwD*&d!0!fsv7s-d+ISycr)KfBP1QXT?&f6pW3D#XveQl}G@PN@eo3C^rDU86Xc` zeW#$XWsA3)^O5A@$%4!f^=DdbEc13)@z)cM0GhGC9Zvo3W3DU7<4)$T zij0Wc&x5?mObXTf)xNIvc1@X`)MpmK9TEt-UCSxD)*Xc9DUOw_o^x`3n}XUKSp`%< z>buSChfN!mz1Fp?4>%`nt3$N5d_+ zg6d%0Tyu3M+sRco{-L2JunB8VD%$yKp^4g#;Ax_zXW4AvfdW@*#O21m0qkl0@4QYp|N(G1@( zQHn$uG)4K}ARksLd{)IlQ9FO06RgF=q;{{Z!b2y>OAcZ;#%T$A`Vtbm_45F2mJYK$we69B$U-)@@pyeX}kUi6I{HTBp4!8DQr)tepTidAyW5Ie2n#G^(8w=LX8Wo0B={pG-8`qcFG zuv0ya#~D#?PMN+gwu)#+@NbWFWTx|U7HQH7YP}C`WqYyx*vF~oS@;KMr?zFWa(yox z{TP2ggjJ&x>D@)-PlnEf?dCDI*wYlTw)PJX#Jonkve+HOUhdJvrT0$JN?9=%eO4F-&v6a^5E$?TUkU$8iWkyd2%j8!3W0GCcpXJQ zd*WJ{;oMytxB5GXA`P=xZL?&YDpE_H`mdWMtj;)SS(6%vveLMzP6+PX8VW}X4?wk+ z0up?q*Zh($9h)-A7t6o;dU_J>j-?R(I@;6(?)>46l15!j2zE9L&N&z2@BdByx6K_) z%pi@E9)s^6e(@#G^G8@;)aifJ=aI1)Cv#2vL;I+mKh>e8hjeL)MyOaTRSn~^m5Ma{ z<+x#ryZT+>H7m9mA?Q|Ns&Yh`pr$CK_FNo!>|BtVT~qm;!eD}dsTQT65$A$?G(YJ? zeeyEoh%dkBPxWiKp(IuDeA7*6s!GTYC{9MtQKzx1Ve9sW(SQ0QESf&On$-$9JCpWU zbRqJH_p(>L0(*G@=T(ZHEDN9>>uEbHn~`5Bvzr}+=j=UdH-HPX!>ym6 zo_U{-zPPwHq(mP?c)LPHIo1&is6}h@L9Js|WSrt>!W+h=vC~C4HX-Ar641TSFVIWR zk0)G=H}!%bCSsQ-7x}#c<;xDn^oW*}@aTKEeDw5K1ZG+3EJokuv+*;<%D!}w{!LNo zncV`tTddZ(ex-a8dqFlbdC2YnYmPAbDJ%nK!s)U4dEQZ{z{guQ_o?Ur*l}3-FjbwpARSIxx-d-@D`c zt%Jd}my$`<6-i%=%W^l9a$NR&mPkVvp@t~w+LG!>SL=`xS6Dvn9%-`wW9Z%=KXLEd zYh%+U>UQo^$KT^JnN|<&{8Ek;nc&HrBx~!sRXW^cPbn=eE!p`I`?7Q-kX^e_%`+~$ zXdKUirQL9}y={l_!i@X*Ice}0^xd(pP_d3==1TYjwWc~mbc##CF=B1l&qoJ?ANQwgq d|N9AI7*`rdqlzH-<|X@oyvim#P2& literal 0 HcmV?d00001 diff --git a/tests/visual_tests/images/python-MyText-reference.png b/tests/visual_tests/images/python-MyText-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..775f4bce92cc1e4b214d4ab720af662d225ce2a3 GIT binary patch literal 2416 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 literal 0 HcmV?d00001 diff --git a/tests/visual_tests/test_python.py b/tests/visual_tests/test_python.py index ac5165c1d..a452f3a87 100755 --- a/tests/visual_tests/test_python.py +++ b/tests/visual_tests/test_python.py @@ -2,9 +2,10 @@ import mapnik import sys import os.path -from compare import compare, summary +from compare import compare dirname = os.path.dirname(__file__) +visual_output_dir = "/tmp/mapnik-visual-images" class MyText(mapnik.FormattingNode): def __init__(self): @@ -71,7 +72,7 @@ m.append_style('Style', style) layer = mapnik.Layer('Layer') -layer.datasource = mapnik.Datasource(**{file=os.path.join(dirname,"data/points.csv")) +layer.datasource = mapnik.Datasource(**{'type':'csv','file':os.path.join(dirname,"data/points.csv")}) layer.styles.append('Style') m.layers.append(layer) @@ -99,9 +100,10 @@ format_trees = [ for format_tree in format_trees: text.placements.defaults.format_tree = format_tree[1] - mapnik.render_to_file(m, os.path.join(dirname,"images", 'python-%s.png' % format_tree[0]), 'png') - compare(os.path.join(dirname,"images", 'python-%s.png' % format_tree[0]), - os.path.join(dirname,"images", 'python-%s-reference.png' % format_tree[0]) - ) + actual = os.path.join(visual_output_dir, 'python-%s.png' % format_tree[0]) + expected = os.path.join(dirname,"images", 'python-%s-reference.png' % format_tree[0]) + mapnik.render_to_file(m, actual, 'png8:m=h') + diff = compare(actual,expected) + if diff > 1: + print 'comparision failed between:\n %s (actual)\n %s (expected)' % (actual,expected) -summary()