Merge pull request #2235 from rutsky/worker_slave_renaming

"slave" string renaming in buildbot-worker tests
buildbot · Jun 5, 2016 · bb19c91 · bb19c91
2 parents 4098ee6 + 6e831fa
commit bb19c91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/worker/buildbot_worker/test/fake/workerforbuilder.py b/worker/buildbot_worker/test/fake/workerforbuilder.py
@@ -26,7 +26,7 @@ class FakeWorkerForBuilder(object):
     """
     debug = False
 
-    def __init__(self, basedir="/slavebuilder/basedir"):
+    def __init__(self, basedir="/workerbuilder/basedir"):
         self.updates = []
         self.basedir = basedir
         self.unicode_encoding = 'utf-8'

diff --git a/...er/test/unit/test_scripts_create_slave.py → ...r/test/unit/test_scripts_create_worker.py b/...er/test/unit/test_scripts_create_slave.py → ...r/test/unit/test_scripts_create_worker.py
@@ -645,7 +645,7 @@ def testBackslashInBasedir(self):
         won't break generated TAC file.
         """
 
-        p = mock.patch.dict(self.options, {"basedir": r"C:\builslave dir\\"})
+        p = mock.patch.dict(self.options, {"basedir": r"C:\buildbot-worker dir\\"})
         p.start()
         try:
             self.assertTACFileContents(self.options)