1
=== modified file 'ci-utils/ci_utils/testing/features.py'
2
--- ci-utils/ci_utils/testing/features.py	2014-11-26 08:09:56 +0000
3
+++ ci-utils/ci_utils/testing/features.py	2015-01-07 16:35:28 +0000
4
@@ -1,5 +1,5 @@
5
1
# Ubuntu CI Engine
1
# Ubuntu CI Engine
7
2
# Copyright 2014 Canonical Ltd.
2
# Copyright 2014, 2015 Canonical Ltd.
8
3
3
9
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
10
5
# under the terms of the GNU Affero General Public License version 3, as
5
# under the terms of the GNU Affero General Public License version 3, as
11
@@ -36,10 +36,6 @@
12
36
class Swift(features.Feature):
36
class Swift(features.Feature):
13
37
37
14
38
    def _probe(self):
38
    def _probe(self):
15
39
        # FIXME: swift needs to handle more transient failures, tests are
16
40
        # currently failing when swift becomes too slow. Disable all tests that
17
41
        # require a "perfect" swift -- vila 2014-11-26
18
42
        return False
19
43
        conn = self.get_connection()
39
        conn = self.get_connection()
20
44
        if conn is None:
40
        if conn is None:
21
45
            return False
41
            return False
22
@@ -71,10 +67,6 @@
23
71
class NovaCompute(features.Feature):
67
class NovaCompute(features.Feature):
24
72
68
25
73
    def _probe(self):
69
    def _probe(self):
26
74
        # FIXME: nova needs to handle more transient failures, tests are
27
75
        # currently failing for various known reasons. Disable all tests that
28
76
        # require a "perfect" nova. -- vila 2014-11-26
29
77
        return False
30
78
        client = self.get_client()
70
        client = self.get_client()
31
79
        if client is None:
71
        if client is None:
32
80
            return False
72
            return False
33
81
73
34
=== modified file 'test_runner/tstrun/testbed.py'
35
--- test_runner/tstrun/testbed.py	2014-10-17 12:28:22 +0000
36
+++ test_runner/tstrun/testbed.py	2015-01-07 16:35:28 +0000
37
@@ -1,6 +1,6 @@
38
1
#!/usr/bin/env python
1
#!/usr/bin/env python
39
2
# Ubuntu CI Engine
2
# Ubuntu CI Engine
41
3
# Copyright 2014 Canonical Ltd.
3
# Copyright 2014, 2015 Canonical Ltd.
42
4
4
43
5
# This program is free software: you can redistribute it and/or modify it
5
# This program is free software: you can redistribute it and/or modify it
44
6
# under the terms of the GNU Affero General Public License version 3, as
6
# under the terms of the GNU Affero General Public License version 3, as
45
@@ -178,8 +178,19 @@
46
178
                msg = ('Rate limit reached for {},'
178
                msg = ('Rate limit reached for {},'
47
179
                       ' will sleep for {} seconds')
179
                       ' will sleep for {} seconds')
48
180
                self.logger.exception(msg.format(func.__name__, nap_time))
180
                self.logger.exception(msg.format(func.__name__, nap_time))
51
181
        time.sleep(nap_time)
181
        except:
52
182
        return func(*args, **kwargs)  # Retry once
182
            # All other exceptions are raised
53
183
            self.logger.exception('{} failed'.format(func.__name__))
54
184
            raise TestBedException('{} failed'.format(func.__name__))
55
185
        try:
56
186
            time.sleep(nap_time)
57
187
            return func(*args, **kwargs)  # Retry once
58
188
        except:
59
189
            # FIXME: This duplicates the two lines above but this method will
60
190
            # be refactored to retry more than once in the future. The
61
191
            # duplication can be fixed then -- vila 2015-01-07
62
192
            self.logger.exception('{} failed'.format(func.__name__))
63
193
            raise TestBedException('{} failed'.format(func.__name__))
64
183
194
65
184
    def flavors_list(self):
195
    def flavors_list(self):
66
185
        return self.retry(self.nova.flavors.list)
196
        return self.retry(self.nova.flavors.list)
67
186
197
68
=== modified file 'test_runner/tstrun/tests/test_testbed.py'
69
--- test_runner/tstrun/tests/test_testbed.py	2014-11-04 12:07:12 +0000
70
+++ test_runner/tstrun/tests/test_testbed.py	2015-01-07 16:35:28 +0000
71
@@ -1,5 +1,5 @@
72
1
# Ubuntu CI Engine
1
# Ubuntu CI Engine
74
2
# Copyright 2014 Canonical Ltd.
2
# Copyright 2014, 2015 Canonical Ltd.
75
3
3
76
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
77
5
# under the terms of the GNU Affero General Public License version 3, as
5
# under the terms of the GNU Affero General Public License version 3, as
78
@@ -128,9 +128,9 @@
79
128
        # This mimics what will happen when we encounter unknown transient
128
        # This mimics what will happen when we encounter unknown transient
80
129
        # failures we want to catch: an exception will bubble up and we'll have
129
        # failures we want to catch: an exception will bubble up and we'll have
81
130
        # to add it to NovaClient.retry().
130
        # to add it to NovaClient.retry().
83
131
        with self.assertRaises(AssertionError) as cm:
131
        with self.assertRaises(testbed.TestBedException) as cm:
84
132
            tb.find_flavor()
132
            tb.find_flavor()
86
133
        self.assertEqual('Boom!', unicode(cm.exception))
133
        self.assertEqual('fail failed', '{}'.format(cm.exception))
87
134
134
88
135
135
89
136
@features.requires(features.nova_creds)
136
@features.requires(features.nova_creds)
90
137
137
91
=== modified file 'tests/test_britney.py'
92
--- tests/test_britney.py	2014-11-03 12:59:48 +0000
93
+++ tests/test_britney.py	2015-01-07 16:35:28 +0000
94
@@ -1,6 +1,6 @@
95
1
#!/usr/bin/env python
1
#!/usr/bin/env python
96
2
# Ubuntu Continuous Integration Engine
2
# Ubuntu Continuous Integration Engine
98
3
# Copyright 2014 Canonical Ltd.
3
# Copyright 2014, 2015 Canonical Ltd.
99
4
4
100
5
# This program is free software: you can redistribute it and/or modify it
5
# This program is free software: you can redistribute it and/or modify it
101
6
# under the terms of the GNU Affero General Public License version 3, as
6
# under the terms of the GNU Affero General Public License version 3, as
102
@@ -37,6 +37,7 @@
103
37
37
104
38
38
105
39
from britney import (
39
from britney import (
106
40
    config,
107
40
    post_request,
41
    post_request,
108
41
    process_results,
42
    process_results,
109
42
)
43
)
110
@@ -186,15 +187,15 @@
111
186
        password = 's3cr3t'
187
        password = 's3cr3t'
112
187
        rabbit_ip = get_rabbit_ip(status)
188
        rabbit_ip = get_rabbit_ip(status)
113
188
        deployers.expose_rabbit(self, rabbit_ip, user, password)
189
        deployers.expose_rabbit(self, rabbit_ip, user, password)
116
189
        os.makedirs(post_request.user_config_dir())
190
        os.makedirs(config.user_config_dir())
117
190
        self.config = post_request.BritneyStack()
191
        self.config = config.BritneyStack()
118
191
        self.config.store._load_from_string('''\
192
        self.config.store._load_from_string('''\
119
192
uci.rabbit.host = {rabbit_ip}
193
uci.rabbit.host = {rabbit_ip}
120
193
uci.rabbit.user = {user}
194
uci.rabbit.user = {user}
121
194
uci.rabbit.password = {password}
195
uci.rabbit.password = {password}
122
195
        '''.format(**locals()))
196
        '''.format(**locals()))
123
196
        fixtures.patch(self, amqp_utils, 'get_config',
197
        fixtures.patch(self, amqp_utils, 'get_config',
125
197
                       post_request.amqp_config(self.config))
198
                       config.amqp_config(self.config))
126
198
        self.out = StringIO()
199
        self.out = StringIO()
127
199
        self.err = StringIO()
200
        self.err = StringIO()
128
200
201
Status:	Rejected
Rejected by:	Vincent Ladeuil on 2015-01-09
Proposed branch:	lp:~vila/uci-engine/nova-failure
Merge into:	lp:uci-engine
Diff against target:	127 lines (+23/-19) 4 files modified ci-utils/ci_utils/testing/features.py (+1/-9) test_runner/tstrun/testbed.py (+14/-3) test_runner/tstrun/tests/test_testbed.py (+3/-3) tests/test_britney.py (+5/-4)
To merge this branch:	bzr merge lp:~vila/uci-engine/nova-failure
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Francis Ginther		Approve on 2015-01-07
Para Siva (community)	2015-01-07	Approve on 2015-01-07
Review via email: mp+245764@code.launchpad.net