← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/state/upgrades_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/state/upgrades_test.go
12
12
        "gopkg.in/mgo.v2/txn"
13
13
 
14
14
        "github.com/juju/juju/network"
 
15
        "github.com/juju/juju/status"
15
16
        "github.com/juju/juju/storage/provider"
16
17
        "github.com/juju/juju/storage/provider/registry"
17
18
)
263
264
        removeStatusDoc(c, s.state, filesystem)
264
265
        _, err := filesystem.Status()
265
266
        c.Assert(err, jc.Satisfies, errors.IsNotFound)
266
 
        s.assertAddFilesystemStatus(c, filesystem, StatusPending)
 
267
        s.assertAddFilesystemStatus(c, filesystem, status.StatusPending)
267
268
}
268
269
 
269
270
func (s *upgradesSuite) TestAddFilesystemStatusDoesNotOverwrite(c *gc.C) {
270
271
        _, _, filesystem, cleanup := setupMachineBoundStorageTests(c, s.state)
271
272
        defer cleanup()
272
273
 
273
 
        err := filesystem.SetStatus(StatusDestroying, "", nil)
 
274
        err := filesystem.SetStatus(status.StatusDestroying, "", nil)
274
275
        c.Assert(err, jc.ErrorIsNil)
275
 
        s.assertAddFilesystemStatus(c, filesystem, StatusDestroying)
 
276
        s.assertAddFilesystemStatus(c, filesystem, status.StatusDestroying)
276
277
}
277
278
 
278
279
func (s *upgradesSuite) TestAddFilesystemStatusProvisioned(c *gc.C) {
284
285
        })
285
286
        c.Assert(err, jc.ErrorIsNil)
286
287
        removeStatusDoc(c, s.state, filesystem)
287
 
        s.assertAddFilesystemStatus(c, filesystem, StatusAttaching)
 
288
        s.assertAddFilesystemStatus(c, filesystem, status.StatusAttaching)
288
289
}
289
290
 
290
291
func (s *upgradesSuite) TestAddFilesystemStatusAttached(c *gc.C) {
307
308
        c.Assert(err, jc.ErrorIsNil)
308
309
 
309
310
        removeStatusDoc(c, s.state, filesystem)
310
 
        s.assertAddFilesystemStatus(c, filesystem, StatusAttached)
 
311
        s.assertAddFilesystemStatus(c, filesystem, status.StatusAttached)
311
312
}
312
313
 
313
 
func (s *upgradesSuite) assertAddFilesystemStatus(c *gc.C, filesystem Filesystem, expect Status) {
 
314
func (s *upgradesSuite) assertAddFilesystemStatus(c *gc.C, filesystem Filesystem, expect status.Status) {
314
315
        err := AddFilesystemStatus(s.state)
315
316
        c.Assert(err, jc.ErrorIsNil)
316
317
 
458
459
        })
459
460
        c.Assert(err, jc.ErrorIsNil)
460
461
 
461
 
        // Add a coule of test spaces, but notably NOT the default one.
 
462
        // Add a couple of test spaces
462
463
        _, err = s.state.AddSpace("db", "", nil, false)
463
464
        c.Assert(err, jc.ErrorIsNil)
464
465
        _, err = s.state.AddSpace("apps", "", nil, true)
519
520
        services := s.setupAddDefaultEndpointBindingsToServices(c)
520
521
        initialBindings := s.getServicesBindings(c, services)
521
522
        wpAllDefaults := map[string]string{
 
523
                // relation names
522
524
                "url":             "",
523
525
                "logging-dir":     "",
524
526
                "monitoring-port": "",
525
527
                "db":              "",
526
528
                "cache":           "",
 
529
                // extra-bindings
 
530
                "db-client": "",
 
531
                "admin-api": "",
 
532
                "foo-bar":   "",
527
533
        }
528
534
        msAllDefaults := map[string]string{
529
535
                "server": "",
537
543
                        "monitoring-port": "",
538
544
                        "db":              "db",
539
545
                        "cache":           "",
 
546
                        "db-client":       "",
 
547
                        "admin-api":       "",
 
548
                        "foo-bar":         "",
540
549
                },
541
550
 
542
551
                "ms-no-bindings":      msAllDefaults,