From 7cf4edfae5c564236e2cd952a41481e278b8979f Mon Sep 17 00:00:00 2001
From: Alistair Coles <alistairncoles@gmail.com>
Date: Thu, 14 Jan 2021 11:56:01 +0000
Subject: [PATCH] Make test_verify_server independent of test env

Previously the test would fail on a case-insensitive filesystem or if
the test environment happened to have a file such as
'swift-test-server' on its PATH.

Change-Id: Ib96d402b9fcb4245e0e79e273643332559f16424
---
 test/unit/common/test_manager.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py
index 9782b2c033..238b6a955a 100644
--- a/test/unit/common/test_manager.py
+++ b/test/unit/common/test_manager.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import print_function
+
 import unittest
 from test.unit import temptree
 
@@ -297,17 +298,23 @@ class TestManagerModule(unittest.TestCase):
             ("-server", "swift--server"))
 
     def test_verify_server(self):
-        # test valid servers
-        self.assertTrue(manager.verify_server('object'))
-        self.assertTrue(manager.verify_server('object-server'))
-        # test invalid servers
-        self.assertFalse(manager.verify_server('test'))
-        self.assertFalse(manager.verify_server('test-server'))
-        self.assertFalse(manager.verify_server('ls'))
-        self.assertFalse(manager.verify_server(''))
-        self.assertFalse(manager.verify_server('Object'))
-        self.assertFalse(manager.verify_server('object1'))
-        self.assertFalse(manager.verify_server(None))
+        def mock_find_exe(f):
+            # pretend that swift-object-server is the only file on path
+            return f if f == 'swift-object-server' else None
+
+        with mock.patch('swift.common.manager.find_executable',
+                        side_effect=mock_find_exe):
+            # test valid servers
+            self.assertTrue(manager.verify_server('object'))
+            self.assertTrue(manager.verify_server('object-server'))
+            # test invalid servers
+            self.assertFalse(manager.verify_server('test'))
+            self.assertFalse(manager.verify_server('test-server'))
+            self.assertFalse(manager.verify_server('ls'))
+            self.assertFalse(manager.verify_server(''))
+            self.assertFalse(manager.verify_server('Object'))
+            self.assertFalse(manager.verify_server('object1'))
+            self.assertFalse(manager.verify_server(None))
 
 
 class TestServer(unittest.TestCase):