Rev 3128: Add tests for the protocol version parameter. in file:///v/home/vila/src/bzr/bugs/175524/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/175524/

------------------------------------------------------------
revno: 3128
revision-id:v.ladeuil+lp at free.fr-20071221094604-tw5le3agd94l5p0h
parent: v.ladeuil+lp at free.fr-20071221094407-hkt3d5nt1lfzt8im
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 10:46:04 +0100
message:
  Add tests for the protocol version parameter.
  
  * bzrlib/tests/test_http.py:
  (TestHTTPServer): Add tests for the protocol version
  parameter. Use addCleanup instead of try/finally.
modified:
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2007-12-20 20:16:38 +0000
+++ b/bzrlib/tests/test_http.py	2007-12-21 09:46:04 +0000
@@ -92,6 +92,14 @@
             server.tearDown()
             self.fail('HTTP Server creation did not raise UnknownProtocol')
 
+    def test_force_invalid_protocol(self):
+        server = http_server.HttpServer(protocol_version='HTTP/0.1')
+        try:
+            self.assertRaises(httplib.UnknownProtocol,server.setUp)
+        except:
+            server.tearDown()
+            self.fail('HTTP Server creation did not raise UnknownProtocol')
+
     def test_server_start_and_stop(self):
         server = http_server.HttpServer()
         server.setUp()
@@ -106,10 +114,8 @@
 
         server = http_server.HttpServer(RequestHandlerOneZero)
         server.setUp()
-        try:
-            self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
-        finally:
-            server.tearDown()
+        self.addCleanup(server.tearDown)
+        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
 
     def test_create_http_server_one_one(self):
         class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
@@ -118,11 +124,33 @@
 
         server = http_server.HttpServer(RequestHandlerOneOne)
         server.setUp()
-        try:
-            self.assertIsInstance(server._httpd,
-                                  http_server.TestingThreadingHTTPServer)
-        finally:
-            server.tearDown()
+        self.addCleanup(server.tearDown)
+        self.assertIsInstance(server._httpd,
+                              http_server.TestingThreadingHTTPServer)
+
+    def test_create_http_server_force_one_one(self):
+        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
+
+            protocol_version = 'HTTP/1.0'
+
+        server = http_server.HttpServer(RequestHandlerOneZero,
+                                        protocol_version='HTTP/1.1')
+        server.setUp()
+        self.addCleanup(server.tearDown)
+        self.assertIsInstance(server._httpd,
+                              http_server.TestingThreadingHTTPServer)
+
+    def test_create_http_server_force_one_zero(self):
+        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
+
+            protocol_version = 'HTTP/1.1'
+
+        server = http_server.HttpServer(RequestHandlerOneOne,
+                                        protocol_version='HTTP/1.0')
+        server.setUp()
+        self.addCleanup(server.tearDown)
+        self.assertIsInstance(server._httpd,
+                              http_server.TestingHTTPServer)
 
 
 class TestWithTransport_pycurl(object):