Changeset 5637 for seattle/trunk

Show
Ignore:
Timestamp:
08/05/12 10:30:06 (7 years ago)
Author:
justinc
Message:

This is a fix for #1081. I didn't fix things like make_base_installers or
dist that don't need to run on different platforms.

Location:
seattle/trunk
Files:
38 modified

Legend:

Unmodified
Added
Removed
  • seattle/trunk/nodemanager/nmAPI.mix

    r5634 r5637  
    3232# needed for path.exists and remove 
    3333import os  
     34 
     35import sys 
    3436 
    3537# needed for copy 
     
    245247    # Conrad: switched this to sequence-style Popen invocation so that spaces 
    246248    # in files work. Switched it back to absolute paths. 
    247     command = ["python", "repy.py"] + ip_iface_preference_flags + [ 
     249    command = [sys.executable, "repy.py"] + ip_iface_preference_flags + [ 
    248250        "--logfile", os.path.abspath(vesseldict[vesselname]['logfilename']), 
    249251        "--stop",    os.path.abspath(vesseldict[vesselname]['stopfilename']), 
  • seattle/trunk/nodemanager/tests/ut_nm_subprocess.py

    r4181 r5637  
    44import os 
    55 
    6 initproc = subprocess.Popen(["python", "nminit.py"]) 
     6initproc = subprocess.Popen([sys.executable, "nminit.py"]) 
    77initproc.wait() 
    88 
    9 nmproc = subprocess.Popen(["python", "nmmain.py", "--test-mode"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     9nmproc = subprocess.Popen([sys.executable, "nmmain.py", "--test-mode"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    1010 
    1111# without closing stdin, stdout, stderr, nmmain.py won't execute on XP 
  • seattle/trunk/nodemanager/tests/ut_securitylayers_subprocess.py

    r4465 r5637  
    77import time 
    88import persist 
     9import sys 
    910 
    1011# initialize directory for security layer files 
     
    1617shutil.copy("private_hideprivate_layer.repy", "securitylayers") 
    1718 
    18 initproc = subprocess.Popen(["python", "nminit.py"]) 
     19initproc = subprocess.Popen([sys.executable, "nminit.py"]) 
    1920initproc.wait() 
    2021 
     
    3233persist.commit_object(configuration, "nodeman.cfg") 
    3334 
    34 nmproc = subprocess.Popen(["python", "nmmain.py", "--test-mode"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     35nmproc = subprocess.Popen([sys.executable, "nmmain.py", "--test-mode"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    3536 
    3637# without closing stdin, stdout, stderr, nmmain.py won't execute on XP 
  • seattle/trunk/oddball/tests/ut_oddball_kill.py

    r3490 r5637  
    99import harshexit 
    1010import utfutil 
     11import sys 
    1112 
    1213  
    1314def main(): 
    1415 
    15   repy_args = ['python', 'repy.py',  
     16  repy_args = [sys.executable, 'repy.py',  
    1617               'restrictions.default', 
    1718               'test_killp_writetodisk.py'] 
  • seattle/trunk/oddball/tests/ut_oddball_repy_order.py

    r3490 r5637  
    55import utfutil 
    66 
     7import sys 
     8 
    79# Make sure repy.py works when invoked with options in a various  
    810# order (to test that adding getopt worked.) 
    911 
    1012def main(): 
    11   args = ['python', 'repy.py',  
     13  args = [sys.executable, 'repy.py',  
    1214          '--simple',  
    1315          '--logfile', 'log.log',  
     
    2325    os.remove("log.log.old") 
    2426 
    25     opposite_args = ['python',    'repy.py', 
     27    opposite_args = [sys.executable,    'repy.py', 
    2628                     '--logfile', 'log.log',  
    2729                     '--simple',  
  • seattle/trunk/preparetest.py

    r4465 r5637  
    7272    #generate a .py file for the .mix file specified by file_path 
    7373    processed_file_path = (os.path.basename(file_path)).replace(".mix",".py") 
    74     (theout, theerr) =  exec_command("python " + script_path + " " + file_path + " " + processed_file_path) 
     74    (theout, theerr) =  exec_command(sys.executable+" " + script_path + " " + file_path + " " + processed_file_path) 
    7575 
    7676    # If there was any problem processing the files, then notify the user. 
  • seattle/trunk/production_nat_new/src/unit_tests/ut_shim_subprocess.py

    r4181 r5637  
    44import os 
    55 
    6 initproc = subprocess.Popen(["python", "nminit.py"]) 
     6initproc = subprocess.Popen([sys.executable, "nminit.py"]) 
    77initproc.wait() 
    88 
    9 nmproc = subprocess.Popen(["python", "nmmain.py", '--test-mode', '--shims', '(RSAShim)(NatForwardingShim)'],stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     9nmproc = subprocess.Popen([sys.executable, "nmmain.py", '--test-mode', '--shims', '(RSAShim)(NatForwardingShim)'],stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    1010 
    1111# without closing stdin, stdout, stderr, nmmain.py won't execute on XP 
  • seattle/trunk/repy/safe.py

    r5636 r5637  
    7979import platform # This is for detecting Nokia tablets 
    8080import __builtin__ 
     81import sys 
    8182 
    8283# Armon: This is how long we will wait for the external process 
     
    283284     
    284285    # Start a safety check process, reading from the user code and outputing to a pipe we can read 
    285     proc = subprocess.Popen(["python", path_to_safe_check],stdin=subprocess.PIPE, stdout=subprocess.PIPE) 
     286    proc = subprocess.Popen([sys.executable, path_to_safe_check],stdin=subprocess.PIPE, stdout=subprocess.PIPE) 
    286287     
    287288    # Write out the user code, close so the other end gets an EOF 
  • seattle/trunk/repy/tests/loggingskeleton.py

    r4180 r5637  
    4949  # run the experiment 
    5050  if not mobileNoSubprocess: 
    51     process = subprocess.Popen(['python', 'repy.py', restrictionsfile, testname, '--logfile', 'experiment.log', '--status', 'foo'],  
     51    process = subprocess.Popen([sys.executable, 'repy.py', restrictionsfile, testname, '--logfile', 'experiment.log', '--status', 'foo'],  
    5252                                    stderr=subprocess.PIPE, stdout=subprocess.PIPE) 
    5353    # (testout, testerr) = exec_repy_script(testname, restrictionfn, {'logfile':'experiment.log', 'status':'foo'}) 
    5454  else: 
    55     process = subprocess.Popen(['python', 'repy.py', restrictionsfile, testname, '--status', 'foo'],  
     55    process = subprocess.Popen([sys.executable, 'repy.py', restrictionsfile, testname, '--status', 'foo'],  
    5656                                    stderr=subprocess.PIPE, stdout=subprocess.PIPE)   
    5757   
  • seattle/trunk/repy/tests/ut_repynetworktests_junkip_checkgetmyip.py

    r3490 r5637  
    55import subprocess 
    66 
    7 process = subprocess.Popen(['python', 'repy.py', '--ip', '256.256.256.256', 'restrictions.default', 'ip_junkip_checkgetmyip.py']) 
     7import sys 
     8 
     9process = subprocess.Popen([sys.executable, 'repy.py', '--ip', '256.256.256.256', 'restrictions.default', 'ip_junkip_checkgetmyip.py']) 
    810process.wait() 
  • seattle/trunk/repy/tests/ut_repynetworktests_junkip_trybind.py

    r3490 r5637  
    44 
    55import subprocess 
     6import sys 
    67 
    7 process = subprocess.Popen(['python', 'repy.py', '--ip', '256.256.256.256', 'restrictions.default', 'ip_junkip_trybind.py']) 
     8process = subprocess.Popen([sys.executable, 'repy.py', '--ip', '256.256.256.256', 'restrictions.default', 'ip_junkip_trybind.py']) 
    89process.wait() 
  • seattle/trunk/repy/tests/ut_repynetworktests_multiple_iface_trybind.py

    r4850 r5637  
    55import subprocess 
    66 
    7 process = subprocess.Popen(['python', 'repy.py', '--iface', 'eth0', '--iface', 'eth1', '--iface', 'en0', '--iface', 'en1', '--iface', 'xl0', '--iface', 'xl1', '--iface', '"Ethernet adapter Local Area Connection"', '--iface', '"Ethernet adapter Local Area Connection 2"', '--nootherips', 'restrictions.default', 'ip_multiple_iface_trybind.py']) 
     7import sys 
     8 
     9process = subprocess.Popen([sys.executable, 'repy.py', '--iface', 'eth0', '--iface', 'eth1', '--iface', 'en0', '--iface', 'en1', '--iface', 'xl0', '--iface', 'xl1', '--iface', '"Ethernet adapter Local Area Connection"', '--iface', '"Ethernet adapter Local Area Connection 2"', '--nootherips', 'restrictions.default', 'ip_multiple_iface_trybind.py']) 
    810process.wait() 
  • seattle/trunk/repy/tests/ut_repynetworktests_nopreferred_noallowed_checkgetmyip.py

    r3490 r5637  
    44 
    55import subprocess 
     6import sys 
    67 
    7 process = subprocess.Popen(['python', 'repy.py', '--iface', 'lo', 'restrictions.default', 'ip_nopreferred_noallowed_checkgetmyip.py']) 
     8process = subprocess.Popen([sys.executable, 'repy.py', '--iface', 'lo', 'restrictions.default', 'ip_nopreferred_noallowed_checkgetmyip.py']) 
    89process.wait() 
  • seattle/trunk/repy/tests/ut_repynetworktests_onlyloopback_checkgetmyip.py

    r3490 r5637  
    44 
    55import subprocess 
     6import sys 
    67 
    7 process = subprocess.Popen(['python', 'repy.py', '--ip', '127.0.0.1', 'restrictions.default', 'ip_onlyloopback_checkgetmyip.py']) 
     8process = subprocess.Popen([sys.executable, 'repy.py', '--ip', '127.0.0.1', 'restrictions.default', 'ip_onlyloopback_checkgetmyip.py']) 
    89process.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testclose.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testfileinit.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testflush.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testnext.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testopen.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testread.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testreadline.py

    r4180 r5637  
    22import time 
    33 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     4import sys 
     5 
     6processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    57(stdoutFirst, stderrFirst) = processOne.communicate() 
    68processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     9processTwo = subprocess.Popen([sys.executable, 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    810(stdoutSecond, stderrSecond) = processTwo.communicate() 
    911processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testreadlines.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testseek.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testwrite.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testwrite.py' ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testwrite.py' ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testwrite.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testwrite.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/repy/tests/ut_repytests_testwrite2.py

    r4180 r5637  
    11import subprocess 
    22import time 
     3import sys 
    34 
    4 processOne = subprocess.Popen(['python', 'repy.py', '--simple', 'restrictions.default', 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     5processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    56(stdoutFirst, stderrFirst) = processOne.communicate() 
    67processOne.wait() 
    7 processTwo = subprocess.Popen(['python', 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     8processTwo = subprocess.Popen([sys.executable, 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    89(stdoutSecond, stderrSecond) = processTwo.communicate() 
    910processTwo.wait() 
  • seattle/trunk/seash/tests/ut_seash_subprocess.py

    r4220 r5637  
    1010import shutil 
    1111 
    12 initproc = subprocess.Popen(["python", "nminit_test.py"]) 
     12initproc = subprocess.Popen([sys.executable, "nminit_test.py"]) 
    1313initproc.wait() 
    1414 
    15 nmproc = subprocess.Popen(["python", "nmmain.py"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
     15nmproc = subprocess.Popen([sys.executable, "nmmain.py"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    1616 
    1717# without closing stdin, stdout, stderr, nmmain.py won't execute on XP 
  • seattle/trunk/service_comp/run_tests.py

    r2912 r5637  
    44import signal 
    55import time 
     6import sys 
    67 
    78# launch three echo servers for testing 
    89def run_echo_servers(): 
    9   args = ['python','repy.py','restrictions.default','echo_server.py','127.0.0.1','12345'] 
     10  args = [sys.executable,'repy.py','restrictions.default','echo_server.py','127.0.0.1','12345'] 
    1011  runners = []  
    1112  runners.append(subprocess.Popen(args)) 
  • seattle/trunk/softwareupdater/softwareupdater.py

    r4903 r5637  
    667667 
    668668  # starts new with arg that is the mutex  
    669   junkupdaterobject = portable_popen.Popen(["python","softwareupdater.py",thismutex]) 
     669  junkupdaterobject = portable_popen.Popen([sys.executable,"softwareupdater.py",thismutex]) 
    670670 
    671671  # wait for some time (1 minute) for them to init and stop them if they don't 
     
    727727  # run the node manager.   I rely on it to do the smart thing (handle multiple 
    728728  # instances, etc.) 
    729   nm_restart_command_args_list = ["python", "nmmain.py"] 
     729  nm_restart_command_args_list = [sys.executable, "nmmain.py"] 
    730730   
    731731  if run_nodemanager_in_foreground: 
  • seattle/trunk/softwareupdater/test/test_updater_local.py

    r3396 r5637  
    130130  print updatefolder 
    131131  # Run the test 
    132   rsync = subprocess.Popen(['python', 'test_rsync.py', testtype]+otherargs+[updateurl], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 
     132  rsync = subprocess.Popen([sys.executable, 'test_rsync.py', testtype]+otherargs+[updateurl], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 
    133133 
    134134  # Get the output 
     
    200200  """ 
    201201 
    202   webserver = subprocess.Popen(['python', 'repy.py', '--cwd', path, 
     202  webserver = subprocess.Popen([sys.executable, 'repy.py', '--cwd', path, 
    203203      'webserver_restrictions.test', 'webserver.repy'],  
    204204      stderr=subprocess.PIPE)  
     
    307307    pscommand = 'ps auxww' 
    308308  
    309     updateprocess = subprocess.Popen(['python', 'softwareupdater.py']) 
     309    updateprocess = subprocess.Popen([sys.executable, 'softwareupdater.py']) 
    310310    if not no_ps: 
    311311      # Only do the ps check if ps is available 
  • seattle/trunk/softwareupdater/test/ut_softwareupdaters_testupdaterlocal.py

    r4142 r5637  
    131131  print updatefolder 
    132132  # Run the test 
    133   rsync = subprocess.Popen(['python', 'test_rsync.py', testtype]+otherargs+[updateurl], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 
     133  rsync = subprocess.Popen([sys.executable, 'test_rsync.py', testtype]+otherargs+[updateurl], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 
    134134 
    135135  # Get the output 
     
    203203 
    204204  stderr = "" 
    205   webserver = subprocess.Popen(['python', 'repy.py', '--cwd', path, 
     205  webserver = subprocess.Popen([sys.executable, 'repy.py', '--cwd', path, 
    206206      'webserver_restrictions.test', 'encapsulatedwebserver.py'],  
    207207      stderr=subprocess.PIPE)  
     
    345345    pscommand = 'ps auxww' 
    346346  
    347     updateprocess = subprocess.Popen(['python', 'softwareupdater.py']) 
     347    updateprocess = subprocess.Popen([sys.executable, 'softwareupdater.py']) 
    348348    if not no_ps: 
    349349      # Only do the ps check if ps is available 
  • seattle/trunk/tuf/seattle_tuf_softwareupdater.py

    r4142 r5637  
    491491 
    492492  # starts new with arg that is the mutex  
    493   junkupdaterobject = portable_popen.Popen(["python","softwareupdater.py",thismutex]) 
     493  junkupdaterobject = portable_popen.Popen([sys.executable,"softwareupdater.py",thismutex]) 
    494494 
    495495  # wait for some time (1 minute) for them to init and stop them if they don't 
     
    551551  # run the node manager.   I rely on it to do the smart thing (handle multiple 
    552552  # instances, etc.) 
    553   nm_restart_command_args_list = ["python", "nmmain.py"] 
     553  nm_restart_command_args_list = [sys.executable, "nmmain.py"] 
    554554   
    555555  if run_nodemanager_in_foreground: 
  • seattle/trunk/utf/tests/ut_utftests_test_file.py

    r4180 r5637  
    11import subprocess 
     2import sys 
    23 
    3 sub = subprocess.Popen(['python', 'utf.py', '-f', 'ut_stagedtest_falsetestone.py'],  
     4sub = subprocess.Popen([sys.executable, 'utf.py', '-f', 'ut_stagedtest_falsetestone.py'],  
    45                                         stderr=subprocess.PIPE,  
    56                                         stdout=subprocess.PIPE) 
  • seattle/trunk/utf/tests/ut_utftests_test_kill.py

    r4181 r5637  
    22 
    33import subprocess 
     4import sys 
    45 
    5 process = subprocess.Popen(['python', 'utf.py', '-m', 'stagedtestsetup'],  
     6process = subprocess.Popen([sys.executable, 'utf.py', '-m', 'stagedtestsetup'],  
    67                           stderr=subprocess.PIPE, 
    78                           stdout=subprocess.PIPE) 
  • seattle/trunk/utf/tests/ut_utftests_test_module.py

    r4180 r5637  
    11import subprocess 
     2import sys 
    23 
    3 sub = subprocess.Popen(['python', 'utf.py', '-m', 'stagedtest'],  
     4sub = subprocess.Popen([sys.executable, 'utf.py', '-m', 'stagedtest'],  
    45                                         stderr=subprocess.PIPE,  
    56                                         stdout=subprocess.PIPE) 
  • seattle/trunk/utf/tests/ut_utftests_test_setup.py

    r4180 r5637  
    22 
    33import subprocess 
     4import sys 
    45 
    5 process = subprocess.Popen(['python', 'utf.py', '-m', 'stagedtestsetup'],  
     6process = subprocess.Popen([sys.executable, 'utf.py', '-m', 'stagedtestsetup'],  
    67                           stderr=subprocess.PIPE, 
    78                           stdout=subprocess.PIPE) 
  • seattle/trunk/utf/tests/ut_utftests_test_shutdown.py

    r4180 r5637  
    22 
    33import subprocess 
     4import sys 
    45 
    5 process = subprocess.Popen(['python', 'utf.py', '-m', 'stagedtestsetup'],  
     6process = subprocess.Popen([sys.executable, 'utf.py', '-m', 'stagedtestsetup'],  
    67                           stderr=subprocess.PIPE, 
    78                           stdout=subprocess.PIPE) 
  • seattle/trunk/utf/tests/ut_utftests_test_subprocess.py

    r4180 r5637  
    22 
    33import subprocess 
     4import sys 
    45 
    5 process = subprocess.Popen(['python', 'utf.py', '-m', 'stagedtestsetup'],  
     6process = subprocess.Popen([sys.executable, 'utf.py', '-m', 'stagedtestsetup'],  
    67                           stderr=subprocess.PIPE, 
    78                           stdout=subprocess.PIPE) 
  • seattle/trunk/utf/utf.py

    r5633 r5637  
    306306  if subprocess_file: 
    307307    print "Now starting subprocess: " + subprocess_file 
    308     sub = subprocess.Popen(['python', subprocess_file], stdin=subprocess.PIPE) 
     308    sub = subprocess.Popen([sys.executable, subprocess_file], stdin=subprocess.PIPE) 
    309309    # Give the process time to start 
    310310    time.sleep(30) 
     
    482482  report = { } 
    483483 
    484   executable = 'python' 
     484  executable = sys.executable 
    485485  popen_args = [ executable ] 
    486486