Backport buffer() tests from trunk to avoid regression failures.

2 files changed, 30 insertions, 0 deletions

diff --git a/Lib/test/output/test_types b/Lib/test/output/test_types
index 065594d6a8..46832bf40f 100644
--- a/Lib/test/output/test_types
+++ b/Lib/test/output/test_types
@@ -13,3 +13,4 @@ test_types
 6.5.3 Lists
 6.5.3a Additional list operations
 6.6 Mappings == Dictionaries
+6.7 Buffers
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index bf356872af..0914194d14 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -289,3 +289,32 @@ for copymode in -1, +1:
                     str(ta), str(tb))
         if a: raise TestFailed, 'a not empty after popitems: %s' % str(a)
         if b: raise TestFailed, 'b not empty after popitems: %s' % str(b)
+
+print '6.7 Buffers'
+try: buffer('asdf', -1)
+except ValueError: pass
+else: raise TestFailed, "buffer('asdf', -1) should raise ValueError"
+
+try: buffer(None)
+except TypeError: pass
+else: raise TestFailed, "buffer(None) should raise TypeError"
+
+a = buffer('asdf')
+hash(a)
+b = a * 5
+if a == b:
+    raise TestFailed, 'buffers should not be equal'
+if str(b) != ('asdf' * 5):
+    raise TestFailed, 'repeated buffer has wrong content'
+if str(a * 0) != '':
+    raise TestFailed, 'repeated buffer zero times has wrong content'
+if str(a + buffer('def')) != 'asdfdef':
+    raise TestFailed, 'concatenation of buffers yields wrong content'
+
+try: a[1] = 'g'
+except TypeError: pass
+else: raise TestFailed, "buffer assignment should raise TypeError"
+
+try: a[0:1] = 'g'
+except TypeError: pass
+else: raise TestFailed, "buffer slice assignment should raise TypeError"