Fix: bootstrapping server fails while locating binaries

isrgomez · isrgomez · commit e2bbafa0141e · 2018-05-15T12:46:51.000-05:00
This patch corrects the ValueError raised when a path
contains duplicated filenames of the MySQL binaries.
diff --git a/tests/mysqld.py b/tests/mysqld.py
@@ -194,11 +194,21 @@ def _init_mysql_install(self):
                 if (afile == EXEC_MYSQLD and
                         os.access(os.path.join(root, afile), 0)):
                     self._sbindir = root
-                    files_to_find.remove(EXEC_MYSQLD)
+                    LOGGER.debug("Located {} in {}".format(
+                        EXEC_MYSQLD, self._sbindir))
+                    try:
+                        files_to_find.remove(EXEC_MYSQLD)
+                    except ValueError:
+                            pass
                 elif (afile == EXEC_MYSQL and
                         os.access(os.path.join(root, afile), 0)):
                     self._bindir = root
-                    files_to_find.remove(EXEC_MYSQL)
+                    LOGGER.debug("Located {} in {}".format(
+                        EXEC_MYSQL, self._bindir))
+                    try:
+                        files_to_find.remove(EXEC_MYSQLD)
+                    except ValueError:
+                            pass
 
                 if not files_to_find:
                     break
