Clean-up common_factories.py #630
Conversation
cvicentiu
force-pushed
the
refactor-1
branch
from
2eac25e to
c6caa3e
Compare
cvicentiu
force-pushed
the
refactor-1
branch
from
c6caa3e to
669c193
Compare
1. Eliminate star imports. Import what you use. 2. Eliminate redundant f-strings without placeholders. 3. Fix wrong escape \ character in Windows-like paths. 4. Eliminate (some) long lines over 80 characters.
|
Thanks, looks good. |
👍 @cvicentiu you might want to challenge/update what's in https://github.com/MariaDB/buildbot/blob/dev/.pylintrc particularly https://github.com/MariaDB/buildbot/blob/dev/.pylintrc#L9 |
|
@fauust thanks, there are many files still using star imports, I'll keep note to disable that once all have been cleaned. |
| @@ -274,7 +298,7 @@ def addWinTests( | |||
| "dojob", | |||
| '"', | |||
| util.Interpolate( | |||
| f'"C:\Program Files (x86)\Microsoft Visual Studio\\2022\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=%(kw:arch)s && cd mysql-test && {cmd}', | |||
| f'"C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\Tools\\VsDevCmd.bat" -arch=%(kw:arch)s && cd mysql-test && {cmd}', | |||
There was a problem hiding this comment.
@cvicentiu
Why do you think \ needs to be escaped?
Buildbot-worker is already handling string interpolation on Windows.
Look for example on line 0 in https://buildbot.mariadb.org/#/builders/234/builds/35330/steps/11/logs/stdio
dojob ^"\^"^" ^"\^"C:\Program Files ^(x86^)\Microsoft Visual Studio\2022\BuildTools\Common7\Tools\VsDevCmd.bat\^" -arch=x64 ^&^& cd mysql-test ^&^& ..\mysql-test\collections\buildbot_suites.bat ^&^& cd ..^" ^"\^"^"
This is one PR out of a sequence to refactor code in BB to make it more maintainable.
This commit should not cause any practical functional changes (to check windows builder paths).
A list of refactoring changes covered in this PR:
NOTE: I HAVE NOT TESTED THIS COMMIT. It should be run in dev to ensure it works.