jenkins-bot submitted this change.

View Change

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
[family] test_family.py was dropped, use wikipedia:test instead

Also _ignore_from_url attribute, initially introduced for test_family,
is no longer available

Change-Id: I6cebf48245e386d6dd70793b7955316aa85f0006
---
M pywikibot/config.py
M tests/edit_tests.py
M tests/family_tests.py
3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pywikibot/config.py b/pywikibot/config.py
index 7f12bcc..2daf484 100644
--- a/pywikibot/config.py
+++ b/pywikibot/config.py
@@ -128,7 +128,7 @@
# The language code of the site we're working on.
mylang = 'language'
# If family and mylang are not modified from the above, the default is changed
-# to test:test, which is test.wikipedia.org, at the end of this module.
+# to wikipedia:test, which is test.wikipedia.org, at the end of this module.

# The dictionary usernames should contain a username for each site where you
# have a bot account. Please set your usernames by adding such lines to your
diff --git a/tests/edit_tests.py b/tests/edit_tests.py
index 415be0a..7ac9fcb 100755
--- a/tests/edit_tests.py
+++ b/tests/edit_tests.py
@@ -129,7 +129,7 @@
},
'Cannot merge revisions from source '
'[[test:User:Sn1per/Nonexistent]] because it does not exist '
- 'on test:test'
+ 'on wikipedia:test'
),
(
{ # nonexistent dest
@@ -138,7 +138,7 @@
},
'Cannot merge revisions to destination '
'[[test:User:Sn1per/Nonexistent]] because it does not exist '
- 'on test:test'
+ 'on wikipedia:test'
),
]

diff --git a/tests/family_tests.py b/tests/family_tests.py
index f790687..18ed841 100755
--- a/tests/family_tests.py
+++ b/tests/family_tests.py
@@ -218,11 +218,9 @@
family = Family.load(family)
for code in family.codes:
self.current_code = code
- url = ('{}://{}{}/$1'.format(family.protocol(code),
- family.hostname(code),
- family.path(code)))
- # Families can switch off if they want to be detected using
- # URL. This applies for test:test (there is test:wikipedia)
+ url = '{}://{}{}/$1'.format(family.protocol(code),
+ family.hostname(code),
+ family.path(code))
with self.subTest(url=url):
self.assertEqual(family.from_url(url), code)


To view, visit change 1040993. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I6cebf48245e386d6dd70793b7955316aa85f0006
Gerrit-Change-Number: 1040993
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot