Revert "make the testsuite handle MSYS2's addition of cmd"

This reverts commit 3c38e4720f.
pull/14080/head
Christoph Reiter 5 months ago committed by Jussi Pakkanen
parent f9d70016fc
commit f782a1f118
  1. 26
      unittests/windowstests.py

@ -54,20 +54,20 @@ class WindowsTests(BasePlatformTests):
PATH to point to a directory with Python scripts. PATH to point to a directory with Python scripts.
''' '''
testdir = os.path.join(self.platform_test_dir, '8 find program') testdir = os.path.join(self.platform_test_dir, '8 find program')
# Find `xcopy` and `xcopy.exe` # Find `cmd` and `cmd.exe`
prog1 = ExternalProgram('xcopy') prog1 = ExternalProgram('cmd')
self.assertTrue(prog1.found(), msg='xcopy not found') self.assertTrue(prog1.found(), msg='cmd not found')
prog2 = ExternalProgram('xcopy.exe') prog2 = ExternalProgram('cmd.exe')
self.assertTrue(prog2.found(), msg='xcopy.exe not found') self.assertTrue(prog2.found(), msg='cmd.exe not found')
self.assertPathEqual(prog1.get_path(), prog2.get_path()) self.assertPathEqual(prog1.get_path(), prog2.get_path())
# Find xcopy.exe with args without searching # Find cmd.exe with args without searching
prog = ExternalProgram('xcopy', command=['xcopy', '/?']) prog = ExternalProgram('cmd', command=['cmd', '/C'])
self.assertTrue(prog.found(), msg='xcopy not found with args') self.assertTrue(prog.found(), msg='cmd not found with args')
self.assertPathEqual(prog.get_command()[0], 'xcopy') self.assertPathEqual(prog.get_command()[0], 'cmd')
# Find xcopy with an absolute path that's missing the extension # Find cmd with an absolute path that's missing the extension
xcopy_path = prog2.get_path()[:-4] cmd_path = prog2.get_path()[:-4]
prog = ExternalProgram(xcopy_path) prog = ExternalProgram(cmd_path)
self.assertTrue(prog.found(), msg=f'{xcopy_path!r} not found') self.assertTrue(prog.found(), msg=f'{cmd_path!r} not found')
# Finding a script with no extension inside a directory works # Finding a script with no extension inside a directory works
prog = ExternalProgram(os.path.join(testdir, 'test-script')) prog = ExternalProgram(os.path.join(testdir, 'test-script'))
self.assertTrue(prog.found(), msg='test-script not found') self.assertTrue(prog.found(), msg='test-script not found')

Loading…
Cancel
Save