# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2018-06-16 05:10:12
# Node ID 6a8ed5c7e1123ce5bd6b1bbecddc6f71eb60aa15
# Parent  70f551a3f52efea4fd3d399e78de97d06f09a177

tests: fold test-template-filters.t into test-template-functions.t

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -489,7 +489,6 @@ test-symlink-placeholder.t
 test-symlinks.t
 test-tag.t
 test-tags.t
-test-template-filters.t
 test-template-functions.t
 test-template-map.t
 test-transplant.t
diff --git a/tests/test-template-filters.t b/tests/test-template-filters.t
deleted file mode 100644
--- a/tests/test-template-filters.t
+++ /dev/null
@@ -1,23 +0,0 @@
-  $ hg debugtemplate '{""|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/bar\nfoo/baz\nfoo/foobar\n"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"foo/bar\nfoo/bar\n"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"/foo/bar\n/foo/bar\n"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"/foo\n/foo\n"|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/bar\nbar/baz"|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/bar\nbar/baz\nbar/foo\n"|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/../bar\nfoo/bar"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"foo\n/foo"|splitlines|commondir}\n'
-  
-  $ hg init
-  $ hg log -r null -T '{rev|commondir}'
-  hg: parse error: argument is not a list of text
-  (template filter 'commondir' is not compatible with keyword 'rev')
-  [255]
diff --git a/tests/test-template-functions.t b/tests/test-template-functions.t
--- a/tests/test-template-functions.t
+++ b/tests/test-template-functions.t
@@ -216,6 +216,32 @@ Filename filters:
   $ hg debugtemplate '{"foo/bar"|stripdir}|{"foo/"|stripdir}|{"foo"|stripdir}|\n'
   foo|foo|foo|
 
+commondir() filter:
+
+  $ hg debugtemplate '{""|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/bar\nfoo/baz\nfoo/foobar\n"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"foo/bar\nfoo/bar\n"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"/foo/bar\n/foo/bar\n"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"/foo\n/foo\n"|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/bar\nbar/baz"|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/bar\nbar/baz\nbar/foo\n"|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/../bar\nfoo/bar"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"foo\n/foo"|splitlines|commondir}\n'
+  
+
+  $ hg log -r null -T '{rev|commondir}'
+  hg: parse error: argument is not a list of text
+  (template filter 'commondir' is not compatible with keyword 'rev')
+  [255]
+
 Add a dummy commit to make up for the instability of the above:
 
   $ echo a > a