]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
update for pytest-xdist terminology
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 14 Aug 2020 16:32:56 +0000 (12:32 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 14 Aug 2020 16:32:56 +0000 (12:32 -0400)
With version 2.0.0 they removed the old terminology, which
I had no idea had been changed in any case for several years.

pushing this out for all branches

Change-Id: I6404b9b04be1ec02dc7a74abe149888dc7166ae5

lib/sqlalchemy/testing/plugin/pytestplugin.py

index ed85922645747e238f5c05ce4b31db91ff73e381..c15a5c06201be00def26bfcdd84c3984a107974f 100644 (file)
@@ -71,9 +71,9 @@ def pytest_addoption(parser):
 
 
 def pytest_configure(config):
-    if hasattr(config, "slaveinput"):
-        plugin_base.restore_important_follower_config(config.slaveinput)
-        plugin_base.configure_follower(config.slaveinput["follower_ident"])
+    if hasattr(config, "workerinput"):
+        plugin_base.restore_important_follower_config(config.workerinput)
+        plugin_base.configure_follower(config.workerinput["follower_ident"])
     else:
         if config.option.write_idents and os.path.exists(
             config.option.write_idents
@@ -101,20 +101,20 @@ if has_xdist:
     import uuid
 
     def pytest_configure_node(node):
-        # the master for each node fills slaveinput dictionary
+        # the master for each node fills workerinput dictionary
         # which pytest-xdist will transfer to the subprocess
 
-        plugin_base.memoize_important_follower_config(node.slaveinput)
+        plugin_base.memoize_important_follower_config(node.workerinput)
 
-        node.slaveinput["follower_ident"] = "test_%s" % uuid.uuid4().hex[0:12]
+        node.workerinput["follower_ident"] = "test_%s" % uuid.uuid4().hex[0:12]
         from sqlalchemy.testing import provision
 
-        provision.create_follower_db(node.slaveinput["follower_ident"])
+        provision.create_follower_db(node.workerinput["follower_ident"])
 
     def pytest_testnodedown(node, error):
         from sqlalchemy.testing import provision
 
-        provision.drop_follower_db(node.slaveinput["follower_ident"])
+        provision.drop_follower_db(node.workerinput["follower_ident"])
 
 
 def pytest_collection_modifyitems(session, config, items):