Merge lp:~jameinel/juju-core/restore-tests-1221705 into lp:~go-bot/juju-core/trunk
Proposed by
John A Meinel
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | John A Meinel | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1771 | ||||
Proposed branch: | lp:~jameinel/juju-core/restore-tests-1221705 | ||||
Merge into: | lp:~go-bot/juju-core/trunk | ||||
Diff against target: |
37 lines (+1/-9) 2 files modified
dependencies.tsv (+1/-1) state/relationunit_test.go (+0/-8) |
||||
To merge this branch: | bzr merge lp:~jameinel/juju-core/restore-tests-1221705 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email:
|
Commit message
state: restore relationunit tests
bug #1221705 was fixed in the mgo driver, so restore the tests.
Description of the change
state: restore relationunit tests
bug #1221705 was fixed in the mgo driver, so restore the tests.
To post a comment you must log in.
Reviewers: mp+184464_ code.launchpad. net,
Message:
Please take a look.
Description:
state: restore relationunit tests
bug #1221705 was fixed in the mgo driver, so restore the tests.
https:/ /code.launchpad .net/~jameinel/ juju-core/ restore- tests-1221705/ +merge/ 184464
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/13548044/
Affected files (+3, -9 lines): nit_test. go
A [revision details]
M dependencies.tsv
M state/relationu
Index: [revision details] 20130906165910- ffixtotwt00i4bu r
=== 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: dependencies.tsv google. com/p/go. crypto hg 1747226a2f43c3f 146f77dede1adf7 073461b616 141 google. com/p/go. net hg 3591c18acabc994 39c783463ef00e6 dc277eee39 77 net/gnuflag bzr net/goamz bzr net/gocheck bzr
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2013-09-06 03:48:38 +0000
+++ dependencies.tsv 2013-09-08 09:23:01 +0000
@@ -1,6 +1,6 @@
code.
code.
-labix.org/v2/mgo bzr <email address hidden>
236
+labix.org/v2/mgo bzr <email address hidden>
245
launchpad.
<email address hidden> 12
launchpad.
<email address hidden> 40
launchpad.
<email address hidden> 85
Index: state/relationu nit_test. go relationunit_ test.go' nit_test. go 2013-09-06 12:27:47 +0000 nit_test. go 2013-09-08 09:23:01 +0000
=== modified file 'state/
--- state/relationu
+++ state/relationu
@@ -467,10 +467,6 @@
}
func (s *RelationUnitSuite) TestProReqWatch Scope(c *gc.C) { /pastebin. canonical. com/97052/ on(c, &s.ConnSuite, charm.ScopeGlobal)
- // TODO(dimitern): Fix this and enable the test.
- // See: https:/
- // BUG: lp:1221705
- c.Skip("disabled - fails on the bot and prevents landing branches")
prr := NewProReqRelati
// Test empty initial events for all RUs.
@@ -557,10 +553,6 @@
}
func (s *RelationUnitSuite) TestContainerWa tchScope( c *gc.C) { /pastebin. canonical. com/97052/ on(c, &s.ConnSuite, charm.ScopeCont ainer)
- // TODO(dimitern): Fix this and enable the test.
- // See: https:/
- // BUG: lp:1221705
- c.Skip("disabled - fails on the bot and prevents landing branches")
prr := NewProReqRelati
// Test empty initial events for all RUs.