Skip to content

Commit 0060f9f

Browse files
committed
fixup merge conflict
1 parent acd0d7e commit 0060f9f

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

Lib/test/test_subprocess.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3818,10 +3818,14 @@ def spy(*args):
38183818
# CREATE_NEW_CONSOLE creates a "popup" window.
38193819
@support.requires_resource('gui')
38203820
def test_creationflags(self):
3821+
# creationflags argument
3822+
CREATE_NEW_CONSOLE = 16
38213823
sys.stderr.write(" a DOS box should flash briefly ...\n")
3822-
subprocess.call(sys.executable +
3823-
' -c "import time; time.sleep(0.25)"',
3824-
creationflags=subprocess.CREATE_NEW_CONSOLE)
3824+
rc = subprocess.call(sys.executable +
3825+
' -c "import time; time.sleep(0.25)"',
3826+
creationflags=CREATE_NEW_CONSOLE)
3827+
support.skip_on_low_desktop_heap_memory_subprocess(rc)
3828+
self.assertEqual(rc, 0)
38253829

38263830
def test_force_hide(self):
38273831
if ctypes:
@@ -3834,10 +3838,6 @@ def test_force_hide(self):
38343838
else:
38353839
script = 'import sys; sys.exit(0)'
38363840
rc = subprocess.call([sys.executable, '-c', script], force_hide=True)
3837-
rc = subprocess.call(sys.executable +
3838-
' -c "import time; time.sleep(0.25)"',
3839-
creationflags=CREATE_NEW_CONSOLE)
3840-
support.skip_on_low_desktop_heap_memory_subprocess(rc)
38413841
self.assertEqual(rc, 0)
38423842

38433843
def test_invalid_args(self):

0 commit comments

Comments
 (0)