1
=== modified file 'test_runner/tstrun/testbed.py'
2
--- test_runner/tstrun/testbed.py	2014-10-17 12:28:22 +0000
3
+++ test_runner/tstrun/testbed.py	2015-01-08 10:31:48 +0000
4
@@ -1,6 +1,6 @@
5
1
#!/usr/bin/env python
1
#!/usr/bin/env python
6
2
# Ubuntu CI Engine
2
# Ubuntu CI Engine
8
3
# Copyright 2014 Canonical Ltd.
3
# Copyright 2014, 2015 Canonical Ltd.
9
4
4
10
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
11
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
12
@@ -178,8 +178,19 @@
13
178
                msg = ('Rate limit reached for {},'
178
                msg = ('Rate limit reached for {},'
14
179
                       ' will sleep for {} seconds')
179
                       ' will sleep for {} seconds')
15
180
                self.logger.exception(msg.format(func.__name__, nap_time))
180
                self.logger.exception(msg.format(func.__name__, nap_time))
18
181
        time.sleep(nap_time)
181
        except:
19
182
        return func(*args, **kwargs)  # Retry once
182
            # All other exceptions are raised
20
183
            self.logger.exception('{} failed'.format(func.__name__))
21
184
            raise TestBedException('{} failed'.format(func.__name__))
22
185
        try:
23
186
            time.sleep(nap_time)
24
187
            return func(*args, **kwargs)  # Retry once
25
188
        except:
26
189
            # FIXME: This duplicates the two lines above but this method will
27
190
            # be refactored to retry more than once in the future. The
28
191
            # duplication can be fixed then -- vila 2015-01-07
29
192
            self.logger.exception('{} failed'.format(func.__name__))
30
193
            raise TestBedException('{} failed'.format(func.__name__))
31
183
194
32
184
    def flavors_list(self):
195
    def flavors_list(self):
33
185
        return self.retry(self.nova.flavors.list)
196
        return self.retry(self.nova.flavors.list)
34
186
197
35
=== modified file 'test_runner/tstrun/tests/test_testbed.py'
36
--- test_runner/tstrun/tests/test_testbed.py	2014-11-04 12:07:12 +0000
37
+++ test_runner/tstrun/tests/test_testbed.py	2015-01-08 10:31:48 +0000
38
@@ -1,5 +1,5 @@
39
1
# Ubuntu CI Engine
1
# Ubuntu CI Engine
41
2
# Copyright 2014 Canonical Ltd.
2
# Copyright 2014, 2015 Canonical Ltd.
42
3
3
43
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
44
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
45
@@ -128,9 +128,9 @@
46
128
        # This mimics what will happen when we encounter unknown transient
128
        # This mimics what will happen when we encounter unknown transient
47
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
48
130
        # to add it to NovaClient.retry().
130
        # to add it to NovaClient.retry().
50
131
        with self.assertRaises(AssertionError) as cm:
131
        with self.assertRaises(testbed.TestBedException) as cm:
51
132
            tb.find_flavor()
132
            tb.find_flavor()
53
133
        self.assertEqual('Boom!', unicode(cm.exception))
133
        self.assertEqual('fail failed', '{}'.format(cm.exception))
54
134
134
55
135
135
56
136
@features.requires(features.nova_creds)
136
@features.requires(features.nova_creds)
Status:	Merged
Approved by:	Ursula Junque on 2015-01-08
Approved revision:	916
Merged at revision:	916
Proposed branch:	lp:~vila/uci-engine/nova-failure-as-testbed-exception
Merge into:	lp:uci-engine
Diff against target:	56 lines (+17/-6) 2 files modified test_runner/tstrun/testbed.py (+14/-3) test_runner/tstrun/tests/test_testbed.py (+3/-3)
To merge this branch:	bzr merge lp:~vila/uci-engine/nova-failure-as-testbed-exception
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Para Siva (community)		2015-01-08	Approve on 2015-01-08
Review via email: mp+245831@code.launchpad.net