← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/juju/application/upgradecharm_resources_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/juju/application/upgradecharm_resources_test.go
45
45
        s.RepoSuite.SetUpTest(c)
46
46
        chPath := testcharms.Repo.ClonedDirPath(s.CharmsPath, "riak")
47
47
 
48
 
        _, err := testing.RunCommand(c, application.NewDeployCommand(), chPath, "riak", "--series", "quantal")
 
48
        _, err := testing.RunCommand(c, application.NewDefaultDeployCommand(), chPath, "riak", "--series", "quantal")
49
49
        c.Assert(err, jc.ErrorIsNil)
50
50
        riak, err := s.State.Application("riak")
51
51
        c.Assert(err, jc.ErrorIsNil)
193
193
        err := ioutil.WriteFile(resourceFile, []byte(resourceContent), 0644)
194
194
        c.Assert(err, jc.ErrorIsNil)
195
195
 
196
 
        ctx, err := testing.RunCommand(c, application.NewDeployCommand(), "trusty/starsay", "--resource", "upload-resource="+resourceFile)
 
196
        ctx, err := testing.RunCommand(c, application.NewDefaultDeployCommand(), "trusty/starsay", "--resource", "upload-resource="+resourceFile)
197
197
        c.Assert(err, jc.ErrorIsNil)
198
198
        output := testing.Stderr(ctx)
199
199