Update set of files cleaned up after parserTests

The parser tests now include more generated thumbnails, so we need to
update the list of thumbnail files we clean up after a run.

Change-Id: Ibabab27ecb895a61f57fff265c8d6d3147666e0d

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index f20d73a..e021dcc 100644 (file)
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -1111,19 +1111,36 @@ class ParserTest {
                self::deleteFiles(
                        array(
                                "$dir/3/3a/Foobar.jpg",
-                               "$dir/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg",
-                               "$dir/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg",
-                               "$dir/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/1000px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/100px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/1280px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/137px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/1500px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/177px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/206px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/20px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/265px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/274px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/300px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/30px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/353px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/400px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/40px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/442px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/450px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/50px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/600px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/75px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/960px-Foobar.jpg",
 
                                "$dir/e/ea/Thumb.png",
@@ -1132,10 +1149,13 @@ class ParserTest {
 
                                "$dir/f/ff/Foobar.svg",
                                "$dir/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png",
-                               "$dir/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png",
-                               "$dir/thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png",
+                               "$dir/thumb/f/ff/Foobar.svg/2000px-Foobar.svg.png",
                                "$dir/thumb/f/ff/Foobar.svg/270px-Foobar.svg.png",
+                               "$dir/thumb/f/ff/Foobar.svg/3000px-Foobar.svg.png",
+                               "$dir/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png",
+                               "$dir/thumb/f/ff/Foobar.svg/4000px-Foobar.svg.png",
                                "$dir/thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.png",
+                               "$dir/thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png",
                                "$dir/thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.png",
 
                                "$dir/math/f/a/5/fa50b8b616463173474302ca3e63586b.png",
@@ -1146,8 +1166,6 @@ class ParserTest {
                        array(
                                "$dir/3/3a",
                                "$dir/3",
-                               "$dir/thumb/6/65",
-                               "$dir/thumb/6",
                                "$dir/thumb/3/3a/Foobar.jpg",
                                "$dir/thumb/3/3a",
                                "$dir/thumb/3",

diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index c6ded02..234eaf2 100644 (file)
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -489,19 +489,36 @@ class NewParserTest extends MediaWikiTestCase {
                self::deleteFiles(
                        array(
                                "$base/local-public/3/3a/Foobar.jpg",
-                               "$base/local-thumb/3/3a/Foobar.jpg/180px-Foobar.jpg",
-                               "$base/local-thumb/3/3a/Foobar.jpg/200px-Foobar.jpg",
-                               "$base/local-thumb/3/3a/Foobar.jpg/640px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/1000px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/100px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/120px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/1280px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/137px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/1500px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/177px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/180px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/200px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/206px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/20px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/220px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/265px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/270px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/274px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/300px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/30px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/330px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/353px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/360px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/400px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/40px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/440px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/442px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/450px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/50px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/600px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/640px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/70px-Foobar.jpg",
+                               "$base/local-thumb/3/3a/Foobar.jpg/75px-Foobar.jpg",
                                "$base/local-thumb/3/3a/Foobar.jpg/960px-Foobar.jpg",
 
                                "$base/local-public/e/ea/Thumb.png",
@@ -509,12 +526,15 @@ class NewParserTest extends MediaWikiTestCase {
                                "$base/local-public/0/09/Bad.jpg",
 
                                "$base/local-public/f/ff/Foobar.svg",
-                               "$base/local-thumb/f/ff/Foobar.svg/180px-Foobar.svg.jpg",
-                               "$base/local-thumb/f/ff/Foobar.svg/270px-Foobar.svg.jpg",
-                               "$base/local-thumb/f/ff/Foobar.svg/360px-Foobar.svg.jpg",
-                               "$base/local-thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.jpg",
-                               "$base/local-thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.jpg",
-                               "$base/local-thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.jpg",
+                               "$base/local-thumb/f/ff/Foobar.svg/180px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/2000px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/270px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/3000px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/360px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/4000px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png",
+                               "$base/local-thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.png",
 
                                "$base/local-public/math/f/a/5/fa50b8b616463173474302ca3e63586b.png",
                        )