# ETH Zurich D-INFK, Universitaetstr 6, CH-8092 Zurich. Attn: Systems Group.
##########################################################################
- import os, shutil, select, datetime, fdpexpect, pexpect
+ import os, shutil, select, datetime, pexpect, tempfile, signal
+ from pexpect import fdpexpect
import barrelfish, debug
from tests import Test
+from harness import RAW_FILE_NAME as RAW_TEST_OUTPUT_FILENAME
DEFAULT_TEST_TIMEOUT = datetime.timedelta(seconds=360)
DEFAULT_BOOT_TIMEOUT = datetime.timedelta(seconds=240)
fh = machine.get_output()
- self.console = fdpexpect.fdspawn(fh, timeout=self.test_timeout)
+ self.console = SignalledFdSpawn(fh, timeout=self.test_timeout)
- self.console.logfile = tempfile.NamedTemporaryFile()
+ self.console.logfile = open(os.path.join(self.testdir, RAW_TEST_OUTPUT_FILENAME), 'wb+')
while self.boot_attempts < MAX_BOOT_ATTEMPTS:
index = self.console.expect(["Barrelfish CPU driver starting",