Index: Lib/test/test_queue.py
===================================================================
--- Lib/test/test_queue.py	(revision 83095)
+++ Lib/test/test_queue.py	(working copy)
@@ -90,6 +90,8 @@
     def simple_queue_test(self, q):
         if q.qsize():
             raise RuntimeError("Call this function with an empty queue")
+        self.assertTrue(q.empty())
+        self.assertFalse(q.full())
         # I guess we better check things actually queue correctly a little :)
         q.put(111)
         q.put(333)
@@ -108,6 +110,8 @@
         full = 3 * 2 * QUEUE_SIZE
         q.put(last)
         self.assertTrue(qfull(q), "Queue should be full")
+        self.assertFalse(q.empty())
+        self.assertTrue(q.full())
         try:
             q.put(full, block=0)
             self.fail("Didn't appear to block with a full queue")
@@ -193,7 +197,26 @@
         self.simple_queue_test(q)
         self.simple_queue_test(q)
 
+    def test_negative_timeout_raises_exception(self):
+        q = self.type2test(QUEUE_SIZE)
+        with self.assertRaises(ValueError):
+          q.put(1, timeout=-1)
+        with self.assertRaises(ValueError):
+          q.get(1, timeout=-1)
 
+    def test_nowait(self):
+        q = self.type2test(QUEUE_SIZE)
+        for i in range(QUEUE_SIZE):
+          q.put_nowait(1)
+        with self.assertRaises(queue.Full):
+          q.put_nowait(1)
+
+        for i in range(QUEUE_SIZE):
+          q.get_nowait()
+        with self.assertRaises(queue.Empty):
+          q.get_nowait()
+
+
 class QueueTest(BaseQueueTest):
     type2test = queue.Queue