geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-06 11:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite parts of Predis\Transaction\MultiExec to make them less ugly.

Browse Source 
We also changed some options for this class, the accepted ones are:

  - "keys": string or array of strings for automatic WATCH.
  - "cas": sets the check-and-set mode.
  - "retry": number of attempts before giving up aborted transactions.
  - "exceptions": sets whether exceptions should be thrown on error
    responses (overrides the "exceptions" client option).

The "on_retry" option has been removed.
This commit is contained in:
Daniele Alessandri
2013-11-17 13:59:35 +01:00
parent 84e0f5af7a
commit 712e6420e9
3 changed files with 109 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Predis/Transaction/MultiExecTest.php
+19 -5
View File
@@ -37,9 +37,9 @@ class MultiExecTest extends StandardTestCase
/**
* @group disconnected
* @expectedException Predis\NotSupportedException
* @expectedExceptionMessage The current profile does not support WATCH and UNWATCH
* @expectedExceptionMessage WATCH is not supported by the current profile
*/
public function testThrowsExceptionOnUnsupportedWatchUnwatchInProfile()
public function testThrowsExceptionOnUnsupportedWatchInProfile()
{
$connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
$client = new Client($connection, array('profile' => '2.0'));
@@ -48,6 +48,20 @@ class MultiExecTest extends StandardTestCase
$tx->watch('foo');
}
/**
* @group disconnected
* @expectedException Predis\NotSupportedException
* @expectedExceptionMessage UNWATCH is not supported by the current profile
*/
public function testThrowsExceptionOnUnsupportedUnwatchInProfile()
{
$connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
$client = new Client($connection, array('profile' => '2.0'));
$tx = new MultiExec($client, array('options' => 'cas'));
$tx->unwatch('foo');
}
/**
* @group disconnected
*/
@@ -129,7 +143,7 @@ class MultiExecTest extends StandardTestCase
/**
* @group disconnected
* @expectedException Predis\ClientException
* @expectedExceptionMessage Cannot invoke 'execute' or 'exec' inside an active client transaction block
* @expectedExceptionMessage Cannot invoke "execute" or "exec" inside an active transaction context
*/
public function testThrowsExceptionOnExecInsideTransactionBlock()
{
@@ -356,7 +370,7 @@ class MultiExecTest extends StandardTestCase
/**
* @group disconnected
* @expectedException InvalidArgumentException
* @expectedExceptionMessage Automatic retries can be used only when a transaction block is provided
* @expectedExceptionMessage Automatic retries can be used only when a callable block is provided
*/
public function testThrowsExceptionOnAutomaticRetriesWithFluentInterface()
{
@@ -629,7 +643,7 @@ class MultiExecTest extends StandardTestCase
/**
* Returns a mocked instance of Predis\Connection\SingleConnectionInterface
* usingthe specified callback to return values from executeCommand().
* using the specified callback to return values from executeCommand().
*
* @param \Closure $executeCallback
* @return \Predis\Connection\SingleConnectionInterface