summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew MacIntyre <andymac@bullseye.apana.org.au>2006-06-13 19:02:35 +0000
committerAndrew MacIntyre <andymac@bullseye.apana.org.au>2006-06-13 19:02:35 +0000
commit93e3ecb1f4b5a0ee85756187e3011b2b214df443 (patch)
treee998bf0de7ea2998dbc8bcd5508124d79367512d
parent7d9743dd6aebe3da1118ed7f0abb7b9cdc6302ff (diff)
downloadcpython-git-93e3ecb1f4b5a0ee85756187e3011b2b214df443.tar.gz
Increase the small thread stack size to get the test
to pass reliably on the one buildbot that insists on more than 32kB of thread stack.
-rw-r--r--Lib/test/output/test_thread4
-rw-r--r--Lib/test/test_thread.py4
-rw-r--r--Lib/test/test_threading.py6
3 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/output/test_thread b/Lib/test/output/test_thread
index d8174ab062..68c6a92dab 100644
--- a/Lib/test/output/test_thread
+++ b/Lib/test/output/test_thread
@@ -7,10 +7,10 @@ all tasks done
*** Changing thread stack size ***
caught expected ValueError setting stack_size(4096)
-successfully set stack_size(32768)
+successfully set stack_size(262144)
successfully set stack_size(1048576)
successfully set stack_size(0)
-trying stack_size = 32768
+trying stack_size = 262144
waiting for all tasks to complete
all tasks done
trying stack_size = 1048576
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 883ca6cc75..c4c21fed00 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -140,13 +140,13 @@ if os_name in ("nt", "os2", "posix"):
if tss_supported:
failed = lambda s, e: s != e
fail_msg = "stack_size(%d) failed - should succeed"
- for tss in (32768, 0x100000, 0):
+ for tss in (262144, 0x100000, 0):
thread.stack_size(tss)
if failed(thread.stack_size(), tss):
raise ValueError, fail_msg % tss
print 'successfully set stack_size(%d)' % tss
- for tss in (32768, 0x100000):
+ for tss in (262144, 0x100000):
print 'trying stack_size = %d' % tss
next_ident = 0
for i in range(numtasks):
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 02f338ac6c..ac4a010bc0 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -85,11 +85,11 @@ class ThreadTests(unittest.TestCase):
print 'all tasks done'
self.assertEqual(numrunning.get(), 0)
- # run with a minimum thread stack size (32kB)
+ # run with a small(ish) thread stack size (256kB)
def test_various_ops_small_stack(self):
if verbose:
- print 'with 32kB thread stack size...'
- threading.stack_size(0x8000)
+ print 'with 256kB thread stack size...'
+ threading.stack_size(262144)
self.test_various_ops()
threading.stack_size(0)