For better review: py3 branch -> master branch

.travis.yml

@@ -1,22 +1,20 @@
 language: python
 sudo: false
+dist: xenial
+os: linux
 
 matrix:
     include:
-        - python: 2.7
-          os: linux
-          dist: xenial
-          env: TOXENV=py27
-        - python: pypy
-          os: linux
-          dist: xenial
-          env: TOXENV=pypy
-        - python: 2.7
-          os: linux
-          dist: xenial
+        - python: 3.5
+          env: TOXENV=py35
+        - python: 3.6
+          env: TOXENV=py36
+        - python: 3.7
+          env: TOXENV=py37
+        - python: 3.8-dev
+          env: TOXENV=py38
+        - python: 3.5
           env: TOXENV=flake8
-    allow_failures:
-    - python: pypy
 
 install:
   - pip install -r requirements.d/development.txt

_ui_tests/conftest.py

@@ -29,4 +29,4 @@ def pytest_runtest_makereport(item, call):
     if call.excinfo is not None:
         if driver_register.get_driver() is not None and hasattr(item, 'obj'):
             driver_register.get_driver().get_screenshot_as_file(
-                unicode(item.obj).split(u" ")[2] + u'.png')
+                str(item.obj).split(" ")[2] + '.png')

_ui_tests/test_subitems.py

@@ -7,27 +7,27 @@
 import utils
 
 
-class TestSubitems(object):
+class TestSubitems:
     """Functional test: create subitem"""
 
     def setup_class(self):
         """opens browser and creates some random item names for these tests"""
         self.driver = utils.create_browser()
         self.base_url = config.BASE_URL
-        self.base_item_name = u"page_" + utils.generate_random_word(5)
-        self.subitem_name = u"subitem_" + utils.generate_random_word(5)
+        self.base_item_name = "page_" + utils.generate_random_word(5)
+        self.subitem_name = "subitem_" + utils.generate_random_word(5)
 
     def create_wiki_item(self, item_name):
         """Creates a new wiki item with name 'item_name'"""
         driver = self.driver
 
-        driver.get(self.base_url + u"/" + item_name)
-        driver.find_element_by_link_text(u"Default").click()
-        driver.find_element_by_link_text(u"Wiki (MoinMoin)").click()
+        driver.get(self.base_url + "/" + item_name)
+        driver.find_element_by_link_text("Default").click()
+        driver.find_element_by_link_text("Wiki (MoinMoin)").click()
         driver.find_element_by_link_text(
-            u"create the item from scratch").click()
+            "create the item from scratch").click()
         driver.find_element_by_id("f_content_form_data_text").send_keys(
-            u"This is a test item\n")
+            "This is a test item\n")
         driver.find_element_by_id("f_submit").click()
 
     def test_createsubitem(self):
@@ -36,28 +36,28 @@ def test_createsubitem(self):
 
         self.create_wiki_item(self.base_item_name)
 
-        driver.get(self.base_url + u"/" + self.base_item_name)
-        driver.find_element_by_link_text(u"Modify").click()
-        driver.find_element_by_id(u"f_content_form_data_text").send_keys(
-            u"\n[[/" + self.subitem_name + "]]\n")
-        driver.find_element_by_id(u"f_submit").click()
-        driver.find_element_by_link_text(u"/" + self.subitem_name).click()
-        driver.find_element_by_link_text(u"Default").click()
-        driver.find_element_by_link_text(u"Wiki (MoinMoin)").click()
-        driver.find_element_by_link_text(u"create the item from scratch").click()
-        driver.find_element_by_id(u"f_content_form_data_text").send_keys(
-            u"This is a test subitem")
-        driver.find_element_by_id(u"f_submit").click()
-        assert u"This is a test subitem" in driver.find_element_by_id(
-            u"moin-content-data").text
-        assert driver.title.split(u" - ")[0] == self.base_item_name + \
-            u"/" + self.subitem_name
+        driver.get(self.base_url + "/" + self.base_item_name)
+        driver.find_element_by_link_text("Modify").click()
+        driver.find_element_by_id("f_content_form_data_text").send_keys(
+            "\n[[/" + self.subitem_name + "]]\n")
+        driver.find_element_by_id("f_submit").click()
+        driver.find_element_by_link_text("/" + self.subitem_name).click()
+        driver.find_element_by_link_text("Default").click()
+        driver.find_element_by_link_text("Wiki (MoinMoin)").click()
+        driver.find_element_by_link_text("create the item from scratch").click()
+        driver.find_element_by_id("f_content_form_data_text").send_keys(
+            "This is a test subitem")
+        driver.find_element_by_id("f_submit").click()
+        assert "This is a test subitem" in driver.find_element_by_id(
+            "moin-content-data").text
+        assert driver.title.split(" - ")[0] == self.base_item_name + \
+            "/" + self.subitem_name
 
     def teardown_class(self):
         """shuts down browser"""
         self.driver.quit()
 
-if __name__ == u'__main__':
+if __name__ == '__main__':
     # This lets us run the test directly, without using py.test
     # This is useful for example for being able to call help, eg
     # 'help(driver)', or 'help(driver.find_element_by_id("f_submit"))'

_ui_tests/utils.py

@@ -5,7 +5,7 @@
 """Functions to facilitate functional testing"""
 
 import random
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 import pytest
 
@@ -15,7 +15,7 @@
 import config
 
 try:
-    f = urllib.urlopen(config.BASE_URL)
+    f = urllib.request.urlopen(config.BASE_URL)
 except IOError:
     pytestmark = pytest.mark.skip('The UI tests need a wiki server running on %s' % config.BASE_URL)
 
@@ -41,7 +41,7 @@ def generate_random_word(length):
     """
     generates a random string containing numbers, of length 'length'
     """
-    word = unicode(random.randint(10 ** (length - 1), 10 ** length))
+    word = str(random.randint(10 ** (length - 1), 10 ** length))
     return word
 
 

contrib/loadtesting/locust/locustfile.py

@@ -15,6 +15,11 @@
 and create wiki items as part of the test. It is best to start with
 an empty wiki (./m new-wiki).
 
+Each locust registers a new id, creates and updates a home page in the user namespace,
+creates and updates a <username> item in the default namespace, and logs-out. Because
+each locust is working on unique items, it does not test edit locking. Use locustfile2.py
+for stress testing edit locking.
+
 To load test Moin2:
  * read about Locust at https://docs.locust.io/en/stable/index.html
  * install Locust per the docs
@@ -39,15 +44,14 @@
 
 import sys
 import argparse
-import urllib
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 
 from locust import HttpLocust, Locust, TaskSet, TaskSequence, task, seq_task
 
 
 user_number = 0
 # test content to put load on indexer
-extra_content = u"""
+extra_content = """
 = %s Home Page =
 
 == Writing a locustfile ==
@@ -98,7 +102,7 @@ def get_home(self):
         # Home and users/Home have been created by setup, see below
         response = self.client.get("/Home")
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(1)
     def click_login(self):
@@ -107,16 +111,16 @@ def click_login(self):
         self.user_name = 'JohnDoe' + str(user_number)
         self.user_email = self.user_name + '@john.doe'
         self.user_home_page = '/users/' + self.user_name
-        print '==== starting user = %s ====' % self.user_name
+        print('==== starting user = %s ====' % self.user_name)
         response = self.client.get("/+login")
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(2)
     def click_register(self):
         response = self.client.get("/+register")
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(3)
     def click_post_register(self):
@@ -127,13 +131,13 @@ def click_post_register(self):
                                      "register_email": self.user_email,
                                     })
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(4)
     def click_login_again(self):
         response = self.client.get("/+login")
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(5)
     def click_post_login(self):
@@ -144,7 +148,7 @@ def click_post_login(self):
                                      "login_nexturl": "/Home",
                                     })
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(6)
     def create_home_page(self):
@@ -153,12 +157,12 @@ def create_home_page(self):
         if response.status_code == 404:
             response.success()
         else:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # click MoinMoin markup link
         home_page_get = '/+modify/users/' + self.user_name + '?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default'
         response = self.client.get(home_page_get)
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # complete form and post
         new_content = '= %s =\n\nMy Home Page created by Locust' % self.user_name
         home_page_post = '/+modify/users/' + self.user_name + '?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template='
@@ -174,34 +178,34 @@ def create_home_page(self):
                                      "extra_meta_text": '{"namespace": "users","rev_number": 1}',
                                      })
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(7)
     @task(4)
     def modify_home_page(self):
         # get users home page
         response = self.client.get(self.user_home_page)
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # click modify link
         home_page = '/+modify' + self.user_home_page + '?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template='
         response = self.client.get(home_page)
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # update the page
         response = self.client.post(home_page,
                                     {"content_form_data_text": extra_content % self.user_name,
                                      "comment": "my homepage comment",
                                      "submit": "OK",
-                                     u'meta_form_contenttype': u'text/x.moin.wiki;charset=utf-8',
+                                     'meta_form_contenttype': 'text/x.moin.wiki;charset=utf-8',
                                      "meta_form_itemtype": "default",
                                      "meta_form_acl": "None",
                                      "meta_form_tags": "apple, pear",
                                      "meta_form_name": self.user_name,
                                      "extra_meta_text": '{"namespace": "users","rev_number":1}',
                                      })
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(8)
     def create_new_page(self):
@@ -211,12 +215,12 @@ def create_new_page(self):
         if response.status_code == 404:
             response.success()
         else:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # click MoinMoin markup link
         page_get = '/+modify/' + new_item_name + '?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default'
         response = self.client.get(page_get)
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # complete form and post
         new_content = '= %s =\n\nNew Item created by Locust' % new_item_name
         new_page_post = '/+modify/' + new_item_name + '?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template='
@@ -232,7 +236,7 @@ def create_new_page(self):
                                      "extra_meta_text": '{"namespace": "","rev_number": 1}',
                                      })
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(9)
     @task(10)
@@ -241,12 +245,12 @@ def modify_new_page(self):
         new_item_name = 'Locust-' + self.user_name
         response = self.client.get('/' + new_item_name)
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # click MoinMoin markup link
         page_get = '/+modify/' + new_item_name + '?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default'
         response = self.client.get(page_get)
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
         # complete form and post
         new_content = '= %s =\n\nNew Item created by Locust' % new_item_name
         new_page_post = '/+modify/' + new_item_name + '?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template='
@@ -262,13 +266,13 @@ def modify_new_page(self):
                                      "extra_meta_text": '{"namespace": "","rev_number": 1}',
                                      })
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
     @seq_task(10)
     def logout(self):
-        response = self.client.get(u"/+logout?logout_submit=1")
+        response = self.client.get("/+logout?logout_submit=1")
         if response.status_code != 200:
-            print '%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code)
+            print('%s: response.status_code = %s' % (sys._getframe().f_lineno, response.status_code))
 
 
 class WebsiteUser(HttpLocust):
@@ -287,29 +291,31 @@ def setup(self):
             if host.endswith('/'):
                 host = host[:-1]
 
-            print '==== creating Home and users/Home ===='
-            url = host + u"/+modify/users/Home?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template="
-            data = urllib.urlencode({"content_form_data_text": "= users/Home =\n * created by Locust",
+            print('==== creating Home and users/Home ====')
+            url = host + "/+modify/users/Home?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template="
+            data = urllib.parse.urlencode({"content_form_data_text": "= users/Home =\n * created by Locust",
                                      "comment": "",
                                      "submit": "OK",
-                                     u'meta_form_contenttype': u'text/x.moin.wiki;charset=utf-8',
+                                     'meta_form_contenttype': 'text/x.moin.wiki;charset=utf-8',
                                      "meta_form_itemtype": "default",
                                      "meta_form_acl": "None",
                                      "meta_form_tags": "None",
                                      "meta_form_name": "Home",
                                      "extra_meta_text": '{"namespace": "users","rev_number": 1}',
                                      })
-            content = urllib2.urlopen(url=url, data=data).read()
+            data = data.encode('utf-8')
+            content = urllib.request.urlopen(url=url, data=data).read()
 
-            url = host + u"/+modify/Home?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template="
-            data = urllib.urlencode({"content_form_data_text": "= Home =\n * created by Locust",
+            url = host + "/+modify/Home?contenttype=text%2Fx.moin.wiki%3Bcharset%3Dutf-8&itemtype=default&template="
+            data = urllib.parse.urlencode({"content_form_data_text": "= Home =\n * created by Locust",
                                      "comment": "",
                                      "submit": "OK",
-                                     u'meta_form_contenttype': u'text/x.moin.wiki;charset=utf-8',
+                                     'meta_form_contenttype': 'text/x.moin.wiki;charset=utf-8',
                                      "meta_form_itemtype": "default",
                                      "meta_form_acl": "None",
                                      "meta_form_tags": "None",
                                      "meta_form_name": "Home",
                                      "extra_meta_text": '{"namespace": "","rev_number": 1}',
                                      })
-            content = urllib2.urlopen(url=url, data=data).read()
+            data = data.encode('utf-8')
+            content = urllib.request.urlopen(url=url, data=data).read()