1
=== modified file 'lib/lp/buildmaster/model/buildbase.py'
2
--- lib/lp/buildmaster/model/buildbase.py	2010-02-16 02:27:24 +0000
3
+++ lib/lp/buildmaster/model/buildbase.py	2010-03-05 23:33:34 +0000
4
@@ -3,6 +3,8 @@
5
3
3
6
4
# pylint: disable-msg=E0211,E0213
4
# pylint: disable-msg=E0211,E0213
7
5
5
8
6
from __future__ import with_statement
9
7
10
6
"""Common build base classes."""
8
"""Common build base classes."""
11
7
9
12
8
__metaclass__ = type
10
__metaclass__ = type
13
@@ -32,6 +34,9 @@
14
32
from lp.soyuz.model.buildqueue import BuildQueue
34
from lp.soyuz.model.buildqueue import BuildQueue
15
33
35
16
34
36
17
37
UPLOAD_LOG_FILENAME = 'uploader.log'
18
38
19
39
20
35
class BuildBase:
40
class BuildBase:
21
36
    """A mixin class providing functionality for farm jobs that build a
41
    """A mixin class providing functionality for farm jobs that build a
22
37
    package.
42
    package.
23
@@ -96,6 +101,25 @@
24
96
            return None
101
            return None
25
97
        return self._getProxiedFileURL(self.buildlog)
102
        return self._getProxiedFileURL(self.buildlog)
26
98
103
27
104
    def getUploadLogContent(self, root, leaf):
28
105
        """Retrieve the upload log contents.
29
106
30
107
        :param root: Root directory for the uploads
31
108
        :param leaf: Leaf for this particular upload
32
109
        :return: Contents of log file or message saying no log file was found.
33
110
        """
34
111
        # Retrieve log file content.
35
112
        possible_locations = (
36
113
            'failed', 'failed-to-move', 'rejected', 'accepted')
37
114
        for location_dir in possible_locations:
38
115
            log_filepath = os.path.join(root, location_dir, leaf,
39
116
                UPLOAD_LOG_FILENAME)
40
117
            if os.path.exists(log_filepath):
41
118
                with open(log_filepath, 'r') as uploader_log_file:
42
119
                    return uploader_log_file.read()
43
120
        else:
44
121
            return 'Could not find upload log file'
45
122
46
99
    @property
123
    @property
47
100
    def upload_log_url(self):
124
    def upload_log_url(self):
48
101
        """See `IBuildBase`."""
125
        """See `IBuildBase`."""
49
@@ -161,7 +185,7 @@
50
161
            out_file = open(out_file_name, "wb")
185
            out_file = open(out_file_name, "wb")
51
162
            copy_and_close(slave_file, out_file)
186
            copy_and_close(slave_file, out_file)
52
163
187
54
164
        uploader_logfilename = os.path.join(upload_dir, 'uploader.log')
188
        uploader_logfilename = os.path.join(upload_dir, UPLOAD_LOG_FILENAME)
55
165
        uploader_command = self.getUploaderCommand(
189
        uploader_command = self.getUploaderCommand(
56
166
            upload_leaf, uploader_logfilename)
190
            upload_leaf, uploader_logfilename)
57
167
        logger.debug("Saving uploader log at '%s'" % uploader_logfilename)
191
        logger.debug("Saving uploader log at '%s'" % uploader_logfilename)
58
@@ -239,23 +263,8 @@
59
239
            not self.verifySuccessfulUpload()):
263
            not self.verifySuccessfulUpload()):
60
240
            logger.debug("Build %s upload failed." % self.id)
264
            logger.debug("Build %s upload failed." % self.id)
61
241
            self.buildstate = BuildStatus.FAILEDTOUPLOAD
265
            self.buildstate = BuildStatus.FAILEDTOUPLOAD
79
242
            # Retrieve log file content.
266
            uploader_log_content = self.getUploadLogContent(root,
80
243
            possible_locations = (
267
                upload_leaf)
64
244
                'failed', 'failed-to-move', 'rejected', 'accepted')
65
245
            for location_dir in possible_locations:
66
246
                upload_final_location = os.path.join(
67
247
                    root, location_dir, upload_leaf)
68
248
                if os.path.exists(upload_final_location):
69
249
                    log_filepath = os.path.join(
70
250
                        upload_final_location, 'uploader.log')
71
251
                    uploader_log_file = open(log_filepath)
72
252
                    try:
73
253
                        uploader_log_content = uploader_log_file.read()
74
254
                    finally:
75
255
                        uploader_log_file.close()
76
256
                    break
77
257
            else:
78
258
                uploader_log_content = 'Could not find upload log file'
81
259
            # Store the upload_log_contents in librarian so it can be
268
            # Store the upload_log_contents in librarian so it can be
82
260
            # accessed by anyone with permission to see the build.
269
            # accessed by anyone with permission to see the build.
83
261
            self.storeUploadLog(uploader_log_content)
270
            self.storeUploadLog(uploader_log_content)
84
262
271
85
=== modified file 'lib/lp/buildmaster/tests/test_buildbase.py'
86
--- lib/lp/buildmaster/tests/test_buildbase.py	2010-02-03 16:21:57 +0000
87
+++ lib/lp/buildmaster/tests/test_buildbase.py	2010-03-05 23:33:34 +0000
88
@@ -1,6 +1,8 @@
89
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
90
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
91
3
3
92
4
from __future__ import with_statement
93
5
94
4
"""Tests for `IBuildBase`."""
6
"""Tests for `IBuildBase`."""
95
5
7
96
6
__metaclass__ = type
8
__metaclass__ = type
97
@@ -45,6 +47,33 @@
98
45
47
99
46
    layer = DatabaseFunctionalLayer
48
    layer = DatabaseFunctionalLayer
100
47
49
101
50
    def test_getUploadLogContent_nolog(self):
102
51
        """If there is no log file there, a string explaining that is returned.
103
52
        """
104
53
        self.useTempDir()
105
54
        build_base = BuildBase()
106
55
        self.assertEquals('Could not find upload log file', 
107
56
            build_base.getUploadLogContent(os.getcwd(), "myleaf"))
108
57
109
58
    def test_getUploadLogContent_only_dir(self):
110
59
        """If there is a directory but no log file, expect the error string,
111
60
        not an exception."""
112
61
        self.useTempDir()
113
62
        os.makedirs("accepted/myleaf")
114
63
        build_base = BuildBase()
115
64
        self.assertEquals('Could not find upload log file', 
116
65
            build_base.getUploadLogContent(os.getcwd(), "myleaf"))
117
66
118
67
    def test_getUploadLogContent_readsfile(self):
119
68
        """If there is a log file, return its contents."""
120
69
        self.useTempDir()
121
70
        os.makedirs("accepted/myleaf")
122
71
        with open('accepted/myleaf/uploader.log', 'w') as f:
123
72
            f.write('foo')
124
73
        build_base = BuildBase()
125
74
        self.assertEquals('foo',
126
75
            build_base.getUploadLogContent(os.getcwd(), "myleaf"))
127
76
128
48
    def test_getUploaderCommand(self):
77
    def test_getUploaderCommand(self):
129
49
        build_base = BuildBase()
78
        build_base = BuildBase()
130
50
        upload_leaf = self.factory.getUniqueString('upload-leaf')
79
        upload_leaf = self.factory.getUniqueString('upload-leaf')
Reviewer	Review Type	Date Requested	Status
Brad Crittenden (community)	code	2010-03-02	Approve on 2010-03-02
Review via email: mp+20465@code.launchpad.net