jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/482402 )

Change subject: [test] test UploadRobot directly from library
......................................................................

[test] test UploadRobot directly from library

- Instead of loading the UploadRobot via script, import it from specialbots
  directly for tests purposed
- use a params dict for creating the bot
- remove default parameter keys

Change-Id: Ie366dccabde17cd5e5be0aecf1ff65d42f9f6cd2
---
M tests/uploadbot_tests.py
1 file changed, 16 insertions(+), 20 deletions(-)

Approvals:
  Framawiki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py
index 37c96f8..f3e9861 100644
--- a/tests/uploadbot_tests.py
+++ b/tests/uploadbot_tests.py
@@ -5,7 +5,7 @@
 These tests write to the wiki.
 """
 #
-# (C) Pywikibot team, 2014-2018
+# (C) Pywikibot team, 2014-2019
 #
 # Distributed under the terms of the MIT license.
 #
@@ -13,7 +13,7 @@

 import os

-from scripts import upload
+from pywikibot.specialbots import UploadRobot

 from tests import join_images_path
 from tests.aspects import unittest, TestCase
@@ -28,40 +28,36 @@
     family = 'wikipedia'
     code = 'test'

+    params = dict(  # noqa: C408
+        description='pywikibot upload.py script test',
+        keepFilename=True,
+        aborts=set(),
+        ignoreWarning=True,
+    )
+
     def test_png_list(self):
         """Test uploading a list of pngs using upload.py."""
         image_list = []
         for directory_info in os.walk(join_images_path()):
             for dir_file in directory_info[2]:
                 image_list.append(os.path.join(directory_info[0], dir_file))
-        bot = upload.UploadRobot(url=image_list,
-                                 description='pywikibot upload.py script test',
-                                 useFilename=None, keepFilename=True,
-                                 verifyDescription=True, aborts=set(),
-                                 ignoreWarning=True,
-                                 targetSite=self.get_site())
+        bot = UploadRobot(url=image_list, targetSite=self.get_site(),
+                          **self.params)
         bot.run()

     def test_png(self):
         """Test uploading a png using upload.py."""
-        bot = upload.UploadRobot(url=[join_images_path('MP_sounds.png')],
-                                 description='pywikibot upload.py script test',
-                                 useFilename=None, keepFilename=True,
-                                 verifyDescription=True, aborts=set(),
-                                 ignoreWarning=True,
-                                 targetSite=self.get_site())
+        bot = UploadRobot(
+            url=[join_images_path('MP_sounds.png')],
+            targetSite=self.get_site(), **self.params)
         bot.run()

     def test_png_url(self):
         """Test uploading a png from url using upload.py."""
         link = 'https://upload.wikimedia.org/'
         link += 'wikipedia/commons/f/fc/MP_sounds.png'
-        bot = upload.UploadRobot(
-            url=[link],
-            description='pywikibot upload.py script test',
-            useFilename=None, keepFilename=True,
-            verifyDescription=True, aborts=set(),
-            ignoreWarning=True, targetSite=self.get_site())
+        bot = UploadRobot(url=[link], targetSite=self.get_site(),
+                          **self.params)
         bot.run()



--
To view, visit https://gerrit.wikimedia.org/r/482402
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.wikimedia.org/r/settings

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie366dccabde17cd5e5be0aecf1ff65d42f9f6cd2
Gerrit-Change-Number: 482402
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Framawiki <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: jenkins-bot (75)
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits

Reply via email to