Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/215889

Change subject: UsageTrackingIntegrationTest: Always try to delete test pages 
before creating them
......................................................................

UsageTrackingIntegrationTest: Always try to delete test pages before creating 
them

Change-Id: I8c557fbc9b8262e70191c61d970378e04a134780
---
M client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/89/215889/1

diff --git 
a/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php 
b/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
index ac33983..f0d578d 100644
--- a/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
+++ b/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
@@ -12,6 +12,7 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Lib\Store\StorageException;
 use Wikibase\Repo\WikibaseRepo;
 use WikiPage;
 use WikitextContent;
@@ -101,10 +102,14 @@
                global $wgUser;
 
                $store = WikibaseRepo::getDefaultInstance()->getEntityStore();
-               $lookup = WikibaseRepo::getDefaultInstance()->getEntityLookup( 
'uncached' );
 
-               $flags = $lookup->hasEntity( $entity->getId() ) ? EDIT_UPDATE : 
EDIT_NEW;
-               $store->saveEntity( $entity, 'TEST', $wgUser, $flags );
+               try {
+                       $store->deleteEntity( $entity->getId(), 'CLEANUP', 
$wgUser );
+               } catch ( StorageException $ex ) {
+                       // never mind
+               }
+
+               $store->saveEntity( $entity, 'TEST', $wgUser, EDIT_NEW );
        }
 
        private function setUpEntities() {

-- 
To view, visit https://gerrit.wikimedia.org/r/215889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c557fbc9b8262e70191c61d970378e04a134780
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to