Update tests from branch

lib/python/TAL/tests/input/test04.html

@@ -11,7 +11,9 @@
 
     <span z:define="global count python:2; global message str:hello world"/>
 
-    <p m:use-macro="whoops">use-macro</p>
+    <p m:use-macro="whoops">use-macro
+      <span m:fill-slot="whoops">fill-slot</span>
+    </p>
 
     <span z:define="global message str:goodbye cruel world"/>
 
@@ -19,8 +21,6 @@
 
     <p m:define-slot="whoops">define-slot</p>
 
-    <p m:fill-slot="whoops">fill-slot</p>
-
   </body>
 
 </html>

lib/python/TAL/tests/input/test04.xml

@@ -12,7 +12,9 @@
 
     <span z:define="global count python:2; global message str:hello world"/>
 
-    <p m:use-macro="whoops">use-macro</p>
+    <p m:use-macro="whoops">use-macro
+      <span m:fill-slot="whoops">fill-slot</span>
+    </p>
 
     <span z:define="global message str:goodbye cruel world"/>
 
@@ -20,8 +22,6 @@
 
     <p m:define-slot="whoops">define-slot</p>
 
-    <p m:fill-slot="whoops">fill-slot</p>
-
   </body>
 
 </html>

lib/python/TAL/tests/input/test_metal1.html

@@ -59,5 +59,3 @@
 </xxx>
 
 <xxx metal:use-macro="INSLOT"></xxx>
-
-

lib/python/TAL/tests/output/test04.html

@@ -33,8 +33,6 @@
 
     <p>define-slot</p>
 
-    <p>fill-slot</p>
-
   </body>
 
 </html>

lib/python/TAL/tests/output/test04.xml

@@ -34,8 +34,6 @@
 
     <p>define-slot</p>
 
-    <p>fill-slot</p>
-
   </body>
 
 </html>

lib/python/TAL/tests/output/test_metal1.html

@@ -23,7 +23,7 @@
 <span metal:use-macro="OUTER2">
   AAA
   <xxx metal:fill-slot="OUTERSLOT">
-  <span metal:use-macro="INNER2">INNER</span>
+  <span>INNER</span>
   </xxx>
   BBB
 </span>
@@ -49,8 +49,8 @@
 <span metal:use-macro="OUTER3">
   AAA
   <xxx metal:fill-slot="OUTERSLOT">
-  <span metal:use-macro="INNER3">INNER
-    <xxx metal:fill-slot="INNERSLOT">INNERSLOT</xxx>
+  <span>INNER
+    <xxx>INNERSLOT</xxx>
   </span>
   </xxx>
   BBB