Merge lp:~dave-cheney/juju-core/104-fix-lp-1298703 into lp:~go-bot/juju-core/trunk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Dave Cheney | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 2504 | ||||
| Proposed branch: | lp:~dave-cheney/juju-core/104-fix-lp-1298703 | ||||
| Merge into: | lp:~go-bot/juju-core/trunk | ||||
| Diff against target: |
51 lines (+15/-9) 2 files modified
state/machine_test.go (+1/-1) state/unit_test.go (+14/-8) |
||||
| To merge this branch: | bzr merge lp:~dave-cheney/juju-core/104-fix-lp-1298703 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
Fix lp 1298703
One failure was a simple list ordering bug.
The other two more complicated. NewAddress always returns an address with the scope of NetworkUnknown. In that case the results from calling unit.Public/
It feels like there are some other footguns in this area.
Should NewAddress/
I'd like to explore removing NewAddress/
Thanks to Ian and Andrew for their assistance
Description of the change
Fix lp 1298703
One failure was a simple list ordering bug.
The other two more complicated. NewAddress always returns an address with the scope of NetworkUnknown. In that case the results from calling unit.Public/
It feels like there are some other footguns in this area.
Should NewAddress/
I'd like to explore removing NewAddress/
Thanks to Ian and Andrew for their assistance
| Dave Cheney (dave-cheney) wrote | # |
| Andrew Wilkins (axwalk) wrote | # |
| Go Bot (go-bot) wrote | # |
| Go Bot (go-bot) wrote | # |
| Dave Cheney (dave-cheney) wrote | # |
Reviewers: mp+213195_
Message:
Please take a look.
Description:
Fix lp 1298703
One failure was a simple list ordering bug.
The other two more complicated. NewAddress always returns an address
with the scope of NetworkUnknown. In that case the results from calling
unit.Public/
It feels like there are some other footguns in this area.
Should NewAddress/
What happens if they leak into the state and back to the client? How
many other places are these things leaking into.
I'd like to explore removing NewAddress/
they are used only for testing (axw), then they are doing us a
disservice.
Thanks to Ian and Andrew for their assistance
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files (+17, -9 lines):
A [revision details]
M state/machine_
M state/unit_test.go
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: state/machine_
=== modified file 'state/
--- state/machine_
+++ state/machine_
@@ -1225,7 +1225,7 @@
c.Assert(err, gc.IsNil)
err = machine.Refresh()
c.Assert(err, gc.IsNil)
- c.Assert(
+ c.Assert(
}
func (s *MachineSuite) TestSetMachineA
Index: state/unit_test.go
=== modified file 'state/
--- state/unit_test.go 2014-03-13 07:54:56 +0000
+++ state/unit_test.go 2014-03-28 04:37:31 +0000
@@ -179,10 +179,13 @@
c.Check(address, gc.Equals, "")
c.Assert(ok, gc.Equals, false)
- addresses := []instance.Address{
- instance.
- instance.
- }
+ public := instance.
+ public.NetworkScope = instance.
+
+ private := instance.
+ private.
+
+ addresses := []instance.
err = machine.
c.Assert(err, gc.IsNil)
@@ -218,10 +221,13 @@
c.Check(address, gc.Equals, "")
c.Assert(ok, gc.Equals, false)
- addresses := []instance.Address{
- instance.
- instance.
- }
+ public := instance.
+ public.NetworkScope = instance.
+
+ private := instance.
+ private.
+
+ addresses := []instance.
err = machine.
c.Assert(err, gc.IsNil)