Juju Charms Collection
nova-cloud-controller package

Merge lp:~nobuto/charms/trusty/nova-cloud-controller/backport-fix-catch-error into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

  1. Trusty Tahr (14.04)
  2. backport-fix-catch-error
  3. Merge into trunk
Proposed by Nobuto Murata
Status: Merged
Merged at revision: 168
Proposed branch: lp:~nobuto/charms/trusty/nova-cloud-controller/backport-fix-catch-error
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/nova_cc_hooks.py (+1/-1)
To merge this branch: bzr merge lp:~nobuto/charms/trusty/nova-cloud-controller/backport-fix-catch-error
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Review via email: mp+271329@code.launchpad.net

Description of the change

backport for stable branch.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #10130 nova-cloud-controller for nobuto mp271329
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12427519/
Build: http://10.245.162.77:8080/job/charm_lint_check/10130/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9292 nova-cloud-controller for nobuto mp271329
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9292/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6467 nova-cloud-controller for nobuto mp271329
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12427672/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6467/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #10183 nova-cloud-controller for nobuto mp271329
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12433941/
Build: http://10.245.162.77:8080/job/charm_lint_check/10183/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9341 nova-cloud-controller for nobuto mp271329
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9341/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6471 nova-cloud-controller for nobuto mp271329
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12434191/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6471/

Revision history for this message
Edward Hope-Morley (hopem) wrote :

lgtm +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_cc_hooks.py'
2--- hooks/nova_cc_hooks.py 2015-08-10 16:36:50 +0000
3+++ hooks/nova_cc_hooks.py 2015-09-16 15:21:29 +0000
4@@ -134,7 +134,7 @@
5 FileNotFoundError
6 except NameError:
7 # python3 compatibility
8- FileNotFoundError = IOError
9+ FileNotFoundError = OSError
10
11 hooks = Hooks()
12 CONFIGS = register_configs()

Subscribers

People subscribed via source and target branches