summaryrefslogtreecommitdiff
path: root/test/git/async/test_channel.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-06-08 19:26:03 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-06-08 19:26:03 +0200
commitf78d4a28f307a9d7943a06be9f919304c25ac2d9 (patch)
treecac3b488a05502b15532b07bb3848e0fdb2df339 /test/git/async/test_channel.py
parent3e2ba9c2028f21d11988558f3557905d21e93808 (diff)
parent772b95631916223e472989b43f3a31f61e237f31 (diff)
downloadgitpython-f78d4a28f307a9d7943a06be9f919304c25ac2d9.tar.gz
Merge branch 'queue' into async
Diffstat (limited to 'test/git/async/test_channel.py')
-rw-r--r--test/git/async/test_channel.py26
1 files changed, 4 insertions, 22 deletions
diff --git a/test/git/async/test_channel.py b/test/git/async/test_channel.py
index acfbd15e..ab4ae015 100644
--- a/test/git/async/test_channel.py
+++ b/test/git/async/test_channel.py
@@ -42,27 +42,9 @@ class TestChannels(TestBase):
self.failUnlessRaises(IOError, wc.write, 1)
# reading from a closed channel never blocks
+ print "preblock"
assert len(rc.read()) == 0
-
-
-
- # TEST LIMITED SIZE CHANNEL
- # channel with max-items set
- wc, rc = Channel(1)
- wc.write(item) # fine
-
- # blocks for a a moment, its full
- st = time.time()
- self.failUnlessRaises(EOFError, wc.write, item, True, to)
- assert time.time() - st >= to
-
- # get our only one
- assert rc.read(1)[0] == item
-
- # its empty,can put one again
- wc.write(item2)
- wc.close()
-
- # reading 10 will only yield one, it will not block as its closed
- assert rc.read(10, timeout=1)[0] == item2
+ print "got read(0)"
+ assert len(rc.read(5)) == 0
+ assert len(rc.read(1)) == 0