r1148 - trunk/tests/profiler

Author: gnichols Date: 2011-11-03 19:03:06 +0000 (Thu, 03 Nov 2011) New Revision: 1148 Modified: trunk/tests/profiler/profiler.py Log: 747736 - v7 test profiler terminates with backtrace Modified: trunk/tests/profiler/profiler.py =================================================================== --- trunk/tests/profiler/profiler.py 2011-11-03 19:02:06 UTC (rev 1147) +++ trunk/tests/profiler/profiler.py 2011-11-03 19:03:06 UTC (rev 1148) @@ -117,16 +117,20 @@ sys.stdout.flush() sys.stderr.flush() pass + + try: + Command("/bin/umount /dev/oprofile").echo() + Command("/sbin/rmmod oprofile").echo() - Command("/bin/umount /dev/oprofile").echo() - Command("/sbin/rmmod oprofile").echo() - sys.stdout.flush() + sys.stdout.flush() + + command = Command("lsmod") + command.run() + if "oprofile" in command.output: + print "Warning: oprofile module not removed on system reset" + except V7CommandException: + pass - command = Command("lsmod") - command.run() - if "oprofile" in command.output: - print "Warning: oprofile module not removed on system reset" - print "^^^^ END: Errors during reset may be ignored. ^^^^\n" sys.stdout.flush()