Changeset 5656

Show
Ignore:
Timestamp:
08/08/12 05:12:00 (7 years ago)
Author:
albert
Message:

Second and final partial fix for #1084

Location:
seattle/trunk
Files:
11 modified

Legend:

Unmodified
Added
Removed
  • seattle/trunk/oddball/tests/ut_oddball_stop.2.py

    r5655 r5656  
    11import utfutil 
     2import utf 
     3 
     4 
    25 
    36def main(): 
     
    912               ] 
    1013 
    11   output = (out, error) = utfutil.execute_repy(repy_args) 
     14  (rawout, error) = utfutil.execute_repy(repy_args) 
     15 
     16  out = utf.strip_android_debug_messages(rawout) 
     17 
    1218  if not error or out: print 'FAIL' 
    1319 
  • seattle/trunk/repy/tests/ut_repytests_testclose.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testfileinit.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testflush.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testnext.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testopen.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testread.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testreadline.py

    r5655 r5656  
    11import subprocess 
    22import time 
    3  
    43import sys 
     4import utf 
    55 
    66processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    88processOne.wait() 
    99processTwo = subprocess.Popen([sys.executable, 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1111processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1215 
    1316if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testreadlines.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testseek.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
    1112 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1215 
    1316if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testwrite2.py

    r5655 r5656  
    22import time 
    33import sys 
     4import utf 
    45 
    56processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    6 (stdoutFirst, stderrFirst) = processOne.communicate() 
     7(rawstdoutFirst, stderrFirst) = processOne.communicate() 
    78processOne.wait() 
    89processTwo = subprocess.Popen([sys.executable, 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    9 (stdoutSecond, stderrSecond) = processTwo.communicate() 
     10(rawstdoutSecond, stderrSecond) = processTwo.communicate() 
    1011processTwo.wait() 
     12 
     13stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
     14stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1115 
    1216if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: