tests/test-glog.t
changeset 35644 7a0a90d63a8c
parent 35643 668c5a527eff
child 35646 a177c6aa055a
--- a/tests/test-glog.t	Tue Jan 02 17:00:48 2018 +0900
+++ b/tests/test-glog.t	Tue Jan 02 17:13:18 2018 +0900
@@ -1500,12 +1500,14 @@
       (func
         (symbol 'branch')
         (string 'default'))
-      (func
-        (symbol 'branch')
-        (string 'branch'))
-      (func
-        (symbol 'branch')
-        (string 'branch'))))
+      (or
+        (list
+          (func
+            (symbol 'branch')
+            (string 'branch'))
+          (func
+            (symbol 'branch')
+            (string 'branch'))))))
   <filteredset
     <spanset- 0:37>,
     <addset
@@ -1571,26 +1573,25 @@
   [255]
   $ testlog --prune 31 --prune 32
   []
-  (and
-    (not
-      (func
-        (symbol 'ancestors')
-        (string '31')))
-    (not
-      (func
-        (symbol 'ancestors')
-        (string '32'))))
+  (not
+    (or
+      (list
+        (func
+          (symbol 'ancestors')
+          (string '31'))
+        (func
+          (symbol 'ancestors')
+          (string '32')))))
   <filteredset
-    <filteredset
-      <spanset- 0:37>,
-      <not
+    <spanset- 0:37>,
+    <not
+      <addset
         <filteredset
           <spanset- 0:37>,
-          <generatorsetdesc+>>>>,
-    <not
-      <filteredset
-        <spanset- 0:37>,
-        <generatorsetdesc+>>>>
+          <generatorsetdesc+>>,
+        <filteredset
+          <spanset- 0:37>,
+          <generatorsetdesc+>>>>>
 
 Dedicated repo for --follow and paths filtering. The g is crafted to
 have 2 filelog topological heads in a linear changeset graph.