changeset:   85160:8179548715ba
tag:         tip
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed Aug 14 01:11:21 2013 +0200
files:       Lib/test/test_os.py
description:
Issue #18296: Try to fix test_os.test_trailers()

Pass the size of the file to os.sendfile(), not an arbitrary value (4096).

Use also a different length for the file content and the trailer.


diff -r f07e4ebfca55 -r 8179548715ba Lib/test/test_os.py
--- a/Lib/test/test_os.py	Tue Aug 13 22:25:56 2013 +0200
+++ b/Lib/test/test_os.py	Wed Aug 14 01:11:21 2013 +0200
@@ -1963,16 +1963,17 @@ class TestSendfile(unittest.TestCase):
 
         def test_trailers(self):
             TESTFN2 = support.TESTFN + "2"
+            file_data = b"abcdef"
             with open(TESTFN2, 'wb') as f:
-                f.write(b"abcde")
+                f.write(file_data)
             with open(TESTFN2, 'rb')as f:
                 self.addCleanup(os.remove, TESTFN2)
-                os.sendfile(self.sockno, f.fileno(), 0, 4096,
-                            trailers=[b"12345"])
+                os.sendfile(self.sockno, f.fileno(), 0, len(file_data),
+                            trailers=[b"1234"])
                 self.client.close()
                 self.server.wait()
                 data = self.server.handler_instance.get_data()
-                self.assertEqual(data, b"abcde12345")
+                self.assertEqual(data, b"abcdef1234")
 
         if hasattr(os, "SF_NODISKIO"):
             def test_flags(self):