1 files changed, 7 insertions, 32 deletions
diff --git a/tests/QtNetwork/http_test.py b/tests/QtNetwork/http_test.py
index 379ff5dfb..5d40405a9 100644
--- a/tests/QtNetwork/http_test.py
+++ b/tests/QtNetwork/http_test.py
@@ -7,24 +7,27 @@ from PySide.QtCore import *
 from PySide.QtNetwork import *
 
 from helper import UsesQApplication
+from httpd import TestServer
 
-"""
 class HttpSignalsCase(UsesQApplication):
     '''Test case for launching QHttp signals'''
 
     def setUp(self):
         super(HttpSignalsCase, self).setUp()
-
         self.http = QHttp()
-        self.url = QUrl('http://www.google.com')
-        self.timer = QTimer.singleShot(250, self.app.quit)
+        self.httpd = TestServer()
+        self.httpd.start()
+        self.url = QUrl('localhost:' + str(self.httpd.port()))
+        self.called = False
 
     def tearDown(self):
+        self.httpd.shutdown()
         del self.http
         super(HttpSignalsCase, self).tearDown()
 
     def callback(self, ident):
         self.called = True
+        self.app.quit()
 
     def testDefaultArgs(self):
         #QHttp signal requestStarted signal
@@ -35,33 +38,5 @@ class HttpSignalsCase(UsesQApplication):
         self.app.exec_()
         self.assert_(self.called)
 
-class testHttp(UsesQApplication):
-    def testRead(self):
-        header = QHttpRequestHeader("GET", QString(QUrl.toPercentEncoding("/index.html")))
-        header.setValue("Host", "qtsoftware.com");
-        http = QHttp()
-        http.setHost("qtsoftware.com")
-        http.request(header)
-        data = http.read(100)
-"""
-
-class testAuthenticationSignal(UsesQApplication):
-    def onAuthRequest(self, hostname, port, auth):
-        self.assert_(isinstance(auth, QAuthenticator))
-        print auth.realm()
-        self._resultOk = True
-        self.app.exit()
-
-    def testwaitSignal(self):
-        self._resultOk = False
-        http = QHttp()
-        http.setHost("projects.maemo.org", QHttp.ConnectionModeHttps, 0)
-        http.connect(SIGNAL("authenticationRequired(const QString&, quint16, QAuthenticator*)"), self.onAuthRequest)
-        path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/")
-        print http.get(path)
-        self.app.exec_()
-        self.assert_(self._resultOk)
-
-
 if __name__ == '__main__':
     unittest.main()