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

[Nobuto Murata]

fix catch error of "No such file or directory" with python2, LP: #1484605

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8703 nova-cloud-controller-next for nobuto mp269064
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8703/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8037 nova-cloud-controller-next for nobuto mp269064
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6025 nova-cloud-controller-next for nobuto mp269064
    AMULET FAIL: amulet-test failed

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

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

[Felipe Reyes (freyes)]

Hi Nobuto,

Thanks for your MP, this looks good to me and the unit tests run OK, and effectively the exception that should be catched in py2.x is OSError[0]. I wonder what I was thinking when I wrote IOError :\

Amulet tests failed, I'll ask beisner to rerun this MP, there is no way this change break them.

Best,

[0] >>> os.remove('/tmp/asdfg')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
OSError: [Errno 2] No such file or directory: '/tmp/asdfg'

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6149 nova-cloud-controller-next for nobuto mp269064
    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/12239081/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6149/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6150 nova-cloud-controller-next for nobuto mp269064
    AMULET FAIL: amulet-test failed

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

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

[Edward Hope-Morley (hopem)]

Both IOError and OSError map to FileNotFound depending on whether it is stdlib or os since it is actually a wrapper for ENOENT - https://docs.python.org/3/library/exceptions.html#FileNotFoundError.

So LGTM +1 but non-os calls will need IOError -> FilNotFound.

review: Approve

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-07-24 12:29:29 +0000
+++ hooks/nova_cc_hooks.py	2015-08-25 13:54:10 +0000
@@ -134,7 +134,7 @@
     FileNotFoundError
 except NameError:
     # python3 compatibility
-    FileNotFoundError = IOError
+    FileNotFoundError = OSError
 
 hooks = Hooks()
 CONFIGS = register_configs()