Merge lp:~osomon/notes-app/robust-test-server into lp:notes-app

[Olivier Tilloy]

Use a different port for the test server when a zombie process doesn’t release the default one,
and use a cleanup function instead of tearDown() for improved robustness.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/notes-app-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/986
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/970
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/986
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/986/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/970
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/970/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3562
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1665

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/262/rebuild

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

The endless loop until a port is found seems a bit dangerous.
It's unlikely to go for a lot of iterations but I feel more confortable if it can be capped to a number of tries before giving up with an exception.

[Olivier Tilloy (osomon)]

> The endless loop until a port is found seems a bit dangerous.
> It's unlikely to go for a lot of iterations but I feel more confortable if it
> can be capped to a number of tries before giving up with an exception.

Thanks for the suggestion, that’s safer indeed. I added a limit (5 retries) at revision 230.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/notes-app-ci/263/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1107/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/45
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/999/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1124
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1107
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1107/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3676/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1787

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/263/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notes-app-autolanding/115/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1125/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-autolanding/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/21
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-autolanding/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1000/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1125
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1108
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3677
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1788

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notes-app-autolanding/116/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1110/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-autolanding/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/22
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-autolanding/22
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1002/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1127
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1110
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1110/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3678/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1789

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notes-app-autolanding/117/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1133
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-autolanding/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/23
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-autolanding/23
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1008
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1133
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1116/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3683/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1794

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notes-app-autolanding/118/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1135
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1118/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-autolanding/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/24
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-autolanding/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-autolanding/24
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1135
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1118
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1118/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3685/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1796

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
--- tests/autopilot/notes_app/tests/__init__.py	2013-11-04 11:12:49 +0000
+++ tests/autopilot/notes_app/tests/__init__.py	2013-11-26 09:48:03 +0000
@@ -7,12 +7,15 @@
 
 """notes-app autopilot tests."""
 
+import base64
 import BaseHTTPServer
+import errno
+import glob
+import md5
+import os
 import os.path
-import glob
+import socket
 import threading
-import base64
-import md5
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.matchers import Eventually
@@ -25,8 +28,6 @@
 from notes_app.emulators.notesapp import NotesApp
 import imagedata
 
-HTTP_SERVER_PORT = 8129
-
 
 class NotesAppTestCase(AutopilotTestCase):
 
@@ -158,12 +159,31 @@
     A simple custom HTTP server run in a separate thread.
     """
 
-    def __init__(self, port):
+    def __init__(self):
         super(HTTPServerInAThread, self).__init__()
-        self.server = BaseHTTPServer.HTTPServer(("", port), HTTPRequestHandler)
+        port = 12345
+        self.server = None
+        while (self.server is None) and (port < 12350):
+            try:
+                self.server = BaseHTTPServer.HTTPServer(("", port),
+                                                        HTTPRequestHandler)
+            except socket.error as error:
+                if (error.errno == errno.EADDRINUSE):
+                    print "Port %d is already in use" % port
+                    port += 1
+                else:
+                    print os.strerror(error.errno)
+                    raise
+        if self.server is None:
+            raise SystemError("Unable to start local HTTP server")
         self.server.allow_reuse_address = True
 
+    @property
+    def port(self):
+        return self.server.server_port
+
     def run(self):
+        print "now serving on port %d" % self.port
         self.server.serve_forever()
 
     def shutdown(self):
@@ -178,11 +198,8 @@
     a simple custom HTTP server in a separate thread.
     """
 
-    def setUp(self):
-        self.server = HTTPServerInAThread(HTTP_SERVER_PORT)
+    def start_server(self):
+        self.server = HTTPServerInAThread()
         self.server.start()
-        super(NotesTestCaseBaseWithHTTPServer, self).setUp()
-
-    def tearDown(self):
-        super(NotesTestCaseBaseWithHTTPServer, self).tearDown()
-        self.server.shutdown()
+        self.addCleanup(self.server.shutdown)
+        self.base_url = "http://localhost:%d" % self.server.port

=== modified file 'tests/autopilot/notes_app/tests/test_images.py'
--- tests/autopilot/notes_app/tests/test_images.py	2013-11-04 11:12:49 +0000
+++ tests/autopilot/notes_app/tests/test_images.py	2013-11-26 09:48:03 +0000
@@ -19,13 +19,13 @@
 
 class BaseForTestImages(NotesTestCaseBaseWithHTTPServer):
     def setUp(self):
+        self.start_server()
         self.setup_db(self.IMAGE)
         super(BaseForTestImages, self).setUp()
 
     def setup_db(self, image):
-        note_data = """{ "elements" : [
-        {"content":"http://localhost:8129/""" + image + """","type":"image"}
-        ]}"""
+        note_data = '{"elements": [{"content":"%s/%s","type":"image"}]}' % \
+                    (self.base_url, image)
         path = self.ensure_db()
         conn = sqlite3.connect(path)
         cursor = conn.cursor()

=== modified file 'tests/autopilot/notes_app/tests/test_parts.py'
--- tests/autopilot/notes_app/tests/test_parts.py	2013-11-04 11:12:49 +0000
+++ tests/autopilot/notes_app/tests/test_parts.py	2013-11-26 09:48:03 +0000
@@ -24,6 +24,7 @@
     """ This is needed to wait for the application to start.
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
+        self.start_server()
         # Setup the database before starting the app
         self.setup_db()
         super(TestFocus, self).setUp()
@@ -31,8 +32,8 @@
     def setup_db(self):
         note_data = """{ "elements" : [
             {"content":"foobar","type":"text"},
-            {"content":"http://localhost:8129/image.png","type":"image"}
-        ]}"""
+            {"content":"%s/image.png","type":"image"}
+        ]}""" % self.base_url
         path = self.ensure_db()
         conn = sqlite3.connect(path)
         cursor = conn.cursor()