Update upgrade tests and remove unneeded path presence assertion.

ExternalReality · ExternalReality · commit 0f5719a55d06 · 2018-10-16T17:47:29.000-05:00
diff --git a/service/agentconf.go b/service/agentconf.go
@@ -207,7 +207,7 @@ func (s *systemdServiceManager) CreateAgentConf(agentName string, dataDir string
 		kind,
 		name,
 		dataDir,
-		paths.MustSucceed(srvPath, fmt.Errorf("path %s does not exist", srvPath)))
+		srvPath)
 	return AgentConf(info, renderer), nil
 }
 
@@ -315,7 +315,7 @@ func startAgent(name string, kind AgentKind, dataDir string, series string) (err
 		kind,
 		name,
 		dataDir,
-		paths.MustSucceed(srvPath, fmt.Errorf("path %s does not exist", srvPath)),
+		srvPath,
 	)
 	conf := AgentConf(info, renderer)
 	svcName := serviceName(name)
diff --git a/upgrades/steps_245_test.go b/upgrades/steps_245_test.go
@@ -20,7 +20,7 @@ type steps245Suite struct {
 
 var _ = gc.Suite(&steps245Suite{})
 
-func (s *steps245Suite) TestCorrectServiceFileLogPath(c *gc.C) {
-	step := findStep(c, v245, "update exec.start.sh log path if not correct")
+func (s *steps245Suite) TestCorrectServiceLogFilePath(c *gc.C) {
+	step := findStep(c, v245, "update exec.start.sh log path if incorrect")
 	c.Assert(step.Targets(), jc.DeepEquals, []upgrades.Target{upgrades.AllMachines})
 }
diff --git a/upgrades/upgrade_test.go b/upgrades/upgrade_test.go
@@ -654,7 +654,7 @@ func (s *upgradeSuite) TestStateUpgradeOperationsVersions(c *gc.C) {
 func (s *upgradeSuite) TestUpgradeOperationsVersions(c *gc.C) {
 	versions := extractUpgradeVersions(c, (*upgrades.UpgradeOperations)())
 	c.Assert(versions, gc.DeepEquals, []string{
-		"2.0.0", "2.2.0", "2.4.0",
+		"2.0.0", "2.2.0", "2.4.0", "2.4.5",
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type steps245Suite struct {`
`20`	`20`
`21`	`21`	`var _ = gc.Suite(&steps245Suite{})`
`22`	`22`
`23`		`-func (s steps245Suite) TestCorrectServiceFileLogPath(c gc.C) {`
`24`		`- step := findStep(c, v245, "update exec.start.sh log path if not correct")`
	`23`	`+func (s steps245Suite) TestCorrectServiceLogFilePath(c gc.C) {`
	`24`	`+ step := findStep(c, v245, "update exec.start.sh log path if incorrect")`
`25`	`25`	`c.Assert(step.Targets(), jc.DeepEquals, []upgrades.Target{upgrades.AllMachines})`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ func (s upgradeSuite) TestStateUpgradeOperationsVersions(c gc.C) {`
`654`	`654`	`func (s upgradeSuite) TestUpgradeOperationsVersions(c gc.C) {`
`655`	`655`	`versions := extractUpgradeVersions(c, (*upgrades.UpgradeOperations)())`
`656`	`656`	`c.Assert(versions, gc.DeepEquals, []string{`
`657`		`- "2.0.0", "2.2.0", "2.4.0",`
	`657`	`+ "2.0.0", "2.2.0", "2.4.0", "2.4.5",`
`658`	`658`	`})`
`659`	`659`	`}`
`660`	`660`