Merge "parserTests: Use a mock parser during article insertion"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 15 Nov 2016 22:47:23 +0000 (22:47 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 15 Nov 2016 22:47:23 +0000 (22:47 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Nov 2016 22:47:23 +0000 (22:47 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Nov 2016 22:47:23 +0000 (22:47 +0000)
diff --cc tests/common/TestsAutoLoader.php
Simple merge
diff --cc tests/parser/ParserTestRunner.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 15 Nov 2016 22:47:23 +0000 (22:47 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 15 Nov 2016 22:47:23 +0000 (22:47 +0000)
		1	2
tests/common/TestsAutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/ParserTestRunner.php	patch \|	diff1 \|	diff2 \|	blob \| history