juju-core

Merge lp:~jameinel/juju-core/restore-tests-1221705 into lp:~go-bot/juju-core/trunk

  1. restore-tests-1221705
  2. Merge into 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
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+184464@code.launchpad.net

Commit message

state: restore relationunit tests

bug #1221705 was fixed in the mgo driver, so restore the tests.

https://codereview.appspot.com/13548044/

Description of the change

state: restore relationunit tests

bug #1221705 was fixed in the mgo driver, so restore the tests.

https://codereview.appspot.com/13548044/

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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):
   A [revision details]
   M dependencies.tsv
   M state/relationunit_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-20130906165910-ffixtotwt00i4bur
+New revision: <email address hidden>

Index: dependencies.tsv
=== 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.google.com/p/go.crypto hg 1747226a2f43c3f146f77dede1adf7073461b616 141
  code.google.com/p/go.net hg 3591c18acabc99439c783463ef00e6dc277eee39 77
-labix.org/v2/mgo bzr <email address hidden>
236
+labix.org/v2/mgo bzr <email address hidden>
245
  launchpad.net/gnuflag bzr
<email address hidden> 12
  launchpad.net/goamz bzr
<email address hidden> 40
  launchpad.net/gocheck bzr
<email address hidden> 85

Index: state/relationunit_test.go
=== modified file 'state/relationunit_test.go'
--- state/relationunit_test.go 2013-09-06 12:27:47 +0000
+++ state/relationunit_test.go 2013-09-08 09:23:01 +0000
@@ -467,10 +467,6 @@
  }

  func (s *RelationUnitSuite) TestProReqWatchScope(c *gc.C) {
- // TODO(dimitern): Fix this and enable the test.
- // See: https://pastebin.canonical.com/97052/
- // BUG: lp:1221705
- c.Skip("disabled - fails on the bot and prevents landing branches")
   prr := NewProReqRelation(c, &s.ConnSuite, charm.ScopeGlobal)

   // Test empty initial events for all RUs.
@@ -557,10 +553,6 @@
  }

  func (s *RelationUnitSuite) TestContainerWatchScope(c *gc.C) {
- // TODO(dimitern): Fix this and enable the test.
- // See: https://pastebin.canonical.com/97052/
- // BUG: lp:1221705
- c.Skip("disabled - fails on the bot and prevents landing branches")
   prr := NewProReqRelation(c, &s.ConnSuite, charm.ScopeContainer)

   // Test empty initial events for all RUs.

Revision history for this message
John A Meinel (jameinel) wrote :

self reviewing because this is just restoring tests.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dependencies.tsv'
2--- dependencies.tsv 2013-09-06 03:48:38 +0000
3+++ dependencies.tsv 2013-09-08 09:30:13 +0000
4@@ -1,6 +1,6 @@
5 code.google.com/p/go.crypto hg 1747226a2f43c3f146f77dede1adf7073461b616 141
6 code.google.com/p/go.net hg 3591c18acabc99439c783463ef00e6dc277eee39 77
7-labix.org/v2/mgo bzr gustavo@niemeyer.net-20130722041249-5v5syfwrb8gq243v 236
8+labix.org/v2/mgo bzr gustavo@niemeyer.net-20130906162000-1oo19qtbrtr6xk98 245
9 launchpad.net/gnuflag bzr roger.peppe@canonical.com-20121003093437-zcyyw0lpvj2nifpk 12
10 launchpad.net/goamz bzr martin.packman@canonical.com-20130820120225-azobjlnr281zn72q 40
11 launchpad.net/gocheck bzr gustavo@niemeyer.net-20130302024745-6ikofwq2c03h7giu 85
12
13=== modified file 'state/relationunit_test.go'
14--- state/relationunit_test.go 2013-09-06 12:27:47 +0000
15+++ state/relationunit_test.go 2013-09-08 09:30:13 +0000
16@@ -467,10 +467,6 @@
17 }
18
19 func (s *RelationUnitSuite) TestProReqWatchScope(c *gc.C) {
20- // TODO(dimitern): Fix this and enable the test.
21- // See: https://pastebin.canonical.com/97052/
22- // BUG: lp:1221705
23- c.Skip("disabled - fails on the bot and prevents landing branches")
24 prr := NewProReqRelation(c, &s.ConnSuite, charm.ScopeGlobal)
25
26 // Test empty initial events for all RUs.
27@@ -557,10 +553,6 @@
28 }
29
30 func (s *RelationUnitSuite) TestContainerWatchScope(c *gc.C) {
31- // TODO(dimitern): Fix this and enable the test.
32- // See: https://pastebin.canonical.com/97052/
33- // BUG: lp:1221705
34- c.Skip("disabled - fails on the bot and prevents landing branches")
35 prr := NewProReqRelation(c, &s.ConnSuite, charm.ScopeContainer)
36
37 // Test empty initial events for all RUs.

Subscribers

People subscribed via source and target branches

to status/vote changes: