Tweaken break

git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@221 656d521f-e311-0410-88e0-e7920216d269

1 files changed, 12 insertions, 0 deletions

diff --git a/pexpect/tests/test_expect.py b/pexpect/tests/test_expect.py
index 7efed49..8df72f2 100755
--- a/pexpect/tests/test_expect.py
+++ b/pexpect/tests/test_expect.py
@@ -55,6 +55,17 @@ class ExpectTestCase(unittest.TestCase):
 
         assert the_old_way == the_new_way
 
+<<<<<<< test_expect.py
+    def test_expect_timeout (self):
+        the_old_way = commands.getoutput('ls -l /bin')
+
+        p = pexpect.spawn('ls -l /bin')
+        i = p.expect(pexpect.TIMEOUT) # This tells it to wait for timeout.
+	assert p.after == pexpect.TIMEOUT
+
+        assert the_old_way == the_new_way
+
+=======
     def test_expect_timeout (self):
         the_old_way = commands.getoutput('ls -l /bin')
 
@@ -62,6 +73,7 @@ class ExpectTestCase(unittest.TestCase):
         i = p.expect(pexpect.TIMEOUT) 
 	assert p.after == pexpect.TIMEOUT
 
+>>>>>>> 1.17
     def test_unexpected_eof (self):
         p = pexpect.spawn('ls -l /bin')
         try: