Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 55 insertions, 0 deletions

diff --git a/tests/phpunit/includes/objectcache/MultiWriteBagOStuffTest.php b/tests/phpunit/includes/objectcache/MultiWriteBagOStuffTest.php
new file mode 100644
index 00000000..2b66181c
--- /dev/null
+++ b/tests/phpunit/includes/objectcache/MultiWriteBagOStuffTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @group Database
+ */
+class MultiWriteBagOStuffTest extends MediaWikiTestCase {
+	/** @var HashBagOStuff */
+	private $cache1;
+	/** @var HashBagOStuff */
+	private $cache2;
+	/** @var MultiWriteBagOStuff */
+	private $cache;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->cache1 = new HashBagOStuff();
+		$this->cache2 = new HashBagOStuff();
+		$this->cache = new MultiWriteBagOStuff( array(
+			'caches' => array( $this->cache1, $this->cache2 ),
+			'replication' => 'async'
+		) );
+	}
+
+	public function testSetImmediate() {
+		$key = wfRandomString();
+		$value = wfRandomString();
+		$this->cache->set( $key, $value );
+
+		// Set in tier 1
+		$this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
+		// Set in tier 2
+		$this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
+	}
+
+	public function testSetDelayed() {
+		$key = wfRandomString();
+		$value = wfRandomString();
+
+		// XXX: DeferredUpdates bound to transactions in CLI mode
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->begin();
+		$this->cache->set( $key, $value );
+
+		// Set in tier 1
+		$this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
+		// Not yet set in tier 2
+		$this->assertEquals( false, $this->cache2->get( $key ), 'Not written to tier 2' );
+
+		$dbw->commit();
+
+		// Set in tier 2
+		$this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
+	}
+}