summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-12 13:41:00 +0100
committerGitHub <noreply@github.com>2018-11-12 13:41:00 +0100
commit859dd1e742c4c71b3fbd7035a866c230b80142c2 (patch)
tree00bd123848ecdaed24e6c5bfc2ed71912b82ac13 /tests/lib
parent0fe2a4f6cdb40ec1e72d22bc1e2cf7dcc9cfbe98 (diff)
parent8e600067444f0478a7091109cf78757176251f69 (diff)
downloadnextcloud-server-859dd1e742c4c71b3fbd7035a866c230b80142c2.tar.gz
nextcloud-server-859dd1e742c4c71b3fbd7035a866c230b80142c2.zip
Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist
Catch UniqueConstraintViolationException inside insertIfNotExist
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/DB/ConnectionTest.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/lib/DB/ConnectionTest.php b/tests/lib/DB/ConnectionTest.php
index 857bb3cd79f..02dd6a1495c 100644
--- a/tests/lib/DB/ConnectionTest.php
+++ b/tests/lib/DB/ConnectionTest.php
@@ -314,11 +314,10 @@ class ConnectionTest extends \Test\TestCase {
/**
* @dataProvider insertIfNotExistsViolatingThrows
- * @expectedException \Doctrine\DBAL\Exception\UniqueConstraintViolationException
*
* @param array $compareKeys
*/
- public function testInsertIfNotExistsViolatingThrows($compareKeys) {
+ public function testInsertIfNotExistsViolatingUnique($compareKeys) {
$this->makeTestTable();
$result = $this->connection->insertIfNotExist('*PREFIX*table',
[