diff --git a/nova/tests/unit/test_wsgi.py b/nova/tests/unit/test_wsgi.py index 4941af753da0..6d6293204eaf 100644 --- a/nova/tests/unit/test_wsgi.py +++ b/nova/tests/unit/test_wsgi.py @@ -244,14 +244,10 @@ class TestWSGIServerWithSSL(test.NoDBTestCase): fake_ssl_server.start() self.assertNotEqual(0, fake_ssl_server.port) - cli = eventlet.connect(("localhost", fake_ssl_server.port)) - cli = eventlet.wrap_ssl(cli, - ca_certs=os.path.join(SSL_CERT_DIR, 'ca.crt')) - - cli.write('POST / HTTP/1.1\r\nHost: localhost\r\n' - 'Connection: close\r\nContent-length:4\r\n\r\nPING') - response = cli.read(8192) - self.assertEqual(response[-4:], "PONG") + response = requests.post( + 'https://127.0.0.1:%s/' % fake_ssl_server.port, + verify=os.path.join(SSL_CERT_DIR, 'ca.crt'), data='PING') + self.assertEqual(response.text, 'PONG') fake_ssl_server.stop() fake_ssl_server.wait() @@ -272,24 +268,19 @@ class TestWSGIServerWithSSL(test.NoDBTestCase): fake_server.start() self.assertNotEqual(0, fake_server.port) - cli = eventlet.connect(("localhost", fake_ssl_server.port)) - cli = eventlet.wrap_ssl(cli, - ca_certs=os.path.join(SSL_CERT_DIR, 'ca.crt')) + response = requests.post( + 'https://127.0.0.1:%s/' % fake_ssl_server.port, + verify=os.path.join(SSL_CERT_DIR, 'ca.crt'), data='PING') + self.assertEqual(response.text, 'PONG') - cli.write('POST / HTTP/1.1\r\nHost: localhost\r\n' - 'Connection: close\r\nContent-length:4\r\n\r\nPING') - response = cli.read(8192) - self.assertEqual(response[-4:], "PONG") - - cli = eventlet.connect(("localhost", fake_server.port)) - - cli.sendall('POST / HTTP/1.1\r\nHost: localhost\r\n' - 'Connection: close\r\nContent-length:4\r\n\r\nPING') - response = cli.recv(8192) - self.assertEqual(response[-4:], "PONG") + response = requests.post('http://127.0.0.1:%s/' % fake_server.port, + data='PING') + self.assertEqual(response.text, 'PONG') fake_ssl_server.stop() fake_ssl_server.wait() + fake_server.stop() + fake_server.wait() @testtools.skipIf(not utils.is_linux(), 'SO_REUSEADDR behaves differently ' 'on OSX and BSD, see bugs '