Merge lp:~verterok/charms/precise/storage/wait-a-bit-longer-if-needed into lp:charms/storage
Proposed by
Guillermo Gonzalez
Status: | Merged |
---|---|
Merged at revision: | 41 |
Proposed branch: | lp:~verterok/charms/precise/storage/wait-a-bit-longer-if-needed |
Merge into: | lp:charms/storage |
Diff against target: |
205 lines (+32/-20) 4 files modified
config.yaml (+5/-0) hooks/common_util.py (+7/-5) hooks/storage-provider.d/block-storage-broker/block-storage-relation-changed (+2/-1) hooks/test_common_util.py (+18/-14) |
To merge this branch: | bzr merge lp:~verterok/charms/precise/storage/wait-a-bit-longer-if-needed |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Butler (community) | Approve | ||
Cory Johns (community) | Approve | ||
Review via email: mp+263016@code.launchpad.net |
Commit message
Add a device_timeout config, default to current 50sec. value to allow configuring how long it waits for a device. Also fix a couple of tests that failed when comparing strings with a \n at the end
Description of the change
Add a device_timeout config, default to current 50sec. value to allow configuring how long it waits for a device. Also fix a couple of tests that failed when comparing strings with a \n at the end
To post a comment you must log in.
This seems entirely reasonable to me, and both the existing and new test cases pass.
+1