Merge lp://staging/~dave-cheney/juju-core/003-testing-charm-rsync into lp://staging/~juju/juju-core/trunk
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~dave-cheney/juju-core/003-testing-charm-rsync |
| Merge into: | lp://staging/~juju/juju-core/trunk |
| Diff against target: |
11 lines (+1/-1) 1 file modified
testing/charm.go (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~dave-cheney/juju-core/003-testing-charm-rsync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| The Go Language Gophers | Pending | ||
|
Review via email:
|
|||
Description of the change
testing: use rsync for clone
cp will return 1 if there are errors copying things like extended attributes. Using rsync is more tollerant of these problems, and makes the tests pass on filesystems that have these attributes. How they got there in the first place is left as an exercise for the reader.
| William Reade (fwereade) wrote | # |
| Gustavo Niemeyer (niemeyer) wrote | # |
Unmerged revisions
- 568. By Dave Cheney
-
use rsync
- 567. By Gustavo Niemeyer
-
state,environs/
cloudinit: fix bootstrap With these changes environments correctly bootstrap again.
R=dfc
CC=
https://codereview. appspot. com/6568043 - 566. By Gustavo Niemeyer
-
state: drop error result from Unit.Resolved
- 565. By Gustavo Niemeyer
-
worker/provisioner: fix non-conflicting merge race
Tests of the provisioner pass, but state's API had changed
under another merge. This fixes it. - 564. By Gustavo Niemeyer
-
state,worker: real lifecycle machines watcher
This introduces real lifecycle support in the machines watcher,
firewaller, provisioner, and fixes it all.Provisioner tests pass again!
R=dfc, TheMue
CC=
https://codereview. appspot. com/6553064 - 563. By Gustavo Niemeyer
-
state: fix environment configuration watcher
R=dfc, TheMue
CC=
https://codereview. appspot. com/6553063 - 562. By Gustavo Niemeyer
-
state: getter methods return NotFoundError
Due to the in-progress lifecycle changes, client code
must be able to distinguish not found errors.R=dfc, TheMue, rog
CC=
https://codereview. appspot. com/6549056 - 561. By William Reade
-
state: drop kill and Die method names
s/Kill/EnsureDying/
s/Die/EnsureDead/The above methods are now implemented in terms of ensureDying and ensureDead
funcs; ensureDead allows you to pass a list of additional txn.Ops that can
block entity death by including Asserts.R=aram, TheMue, niemeyer
CC=
https://codereview. appspot. com/6553051 - 560. By Roger Peppe
-
environs/ec2: fix tests
submitting as it's totally trivial.
- 559. By Roger Peppe
-
cmd/juju: fix tests
R=aram
CC=
https://codereview. appspot. com/6547058
On 2012/09/25 02:44:42, dfc wrote:
> Please take a look.
LGTM
https:/