lp:~adam-collard/charm-helpers/fix-mock-failures

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charm-helpers at revision 402

Chris Glass (community): Approve on 2015-07-15

Fernando Correa Neto (community): Approve on 2015-07-15

Diff: 455 lines (+83/-55)

11 files modified

charmhelpers/contrib/benchmark/__init__.py (+3/-1)
charmhelpers/fetch/archiveurl.py (+7/-1)
test_requirements.txt (+1/-1)
tests/contrib/benchmark/test_benchmark.py (+17/-13)
tests/contrib/hahelpers/test_apache_utils.py (+1/-1)
tests/contrib/openstack/test_openstack_utils.py (+2/-2)
tests/contrib/python/test_debug.py (+1/-1)
tests/contrib/storage/test_linux_ceph.py (+11/-11)
tests/core/test_host.py (+1/-1)
tests/fetch/test_archiveurl.py (+21/-3)
tests/fetch/test_fetch.py (+18/-20)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

405. By Adam Collard on 2015-07-15

Improve the Exception that's raised, add test coverage

404. By Adam Collard on 2015-07-15

Fix assert for error calling (fcorrea's review)

403. By Adam Collard on 2015-07-15

Fix version of mock that's installed to avoid problems with six.wraps

402. By Adam Collard on 2015-07-14

Fix broken tests

401. By Jorge Niedbalski on 2015-07-09

[freyes,r=niedbalski] Charmhelpers fix required for Bug #1423439.

400. By James Page on 2015-07-02

Updates for ceph/cinder amulet tests

Update validate_config_data - enable use of boolean comparison methods

Add check_commands_on_units - check lists of commands on lists of units

Add authenticate_cinder_admin

Add create_cinder_volume

Update create_cirros_image to use generic resource status methods, add
validation.

Simplify delete_image to use generic resource_delete method.

Simplify delete_instance to use generic resource_delete method.

These changes preserve existing behavior while adding new capabilities.

399. By James Page on 2015-07-02

Trim leading spaces from ceph templates

398. By Tim Van Steenburgh on 2015-07-02

[stub] Rework apt_hold into apt_hold, apt_unhold, and general apt_mark

397. By Jorge Niedbalski on 2015-07-01

[paolo-de-rosa,r=niedbalski] Added mysql innodb_flush_log_at_trx_commit option.

396. By Tim Van Steenburgh on 2015-06-30

Clean up sphinx warnings/errors