Merge pull request #13969 from manadart/dqlite-manifolds

[JUJU-1002] Fix machine manifolds tests for db-accessor
juju · Apr 21, 2022 · 5449603 · 5449603
2 parents 7b612a0 + 9a6bd64
commit 5449603
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/charmhub/refresh_test.go b/charmhub/refresh_test.go
@@ -884,7 +884,7 @@ func (s *RefreshConfigSuite) TestDownloadOneFromChannelBuildK8s(c *gc.C) {
 			Channel:     &channel,
 			Base: &transport.Base{
 				Name:         "ubuntu",
-				Channel:      "20.04",
+				Channel:      "22.04",
 				Architecture: arch.DefaultArchitecture,
 			},
 		}},

diff --git a/cmd/jujud/agent/machine/manifolds_test.go b/cmd/jujud/agent/machine/manifolds_test.go
@@ -71,6 +71,7 @@ func (s *ManifoldsSuite) TestManifoldNamesIAAS(c *gc.C) {
 			"certificate-watcher",
 			"clock",
 			"controller-port",
+			"db-accessor",
 			"deployer",
 			"disk-manager",
 			"external-controller-updater",
@@ -147,6 +148,7 @@ func (s *ManifoldsSuite) TestManifoldNamesCAAS(c *gc.C) {
 			"certificate-watcher",
 			"clock",
 			"controller-port",
+			"db-accessor",
 			"external-controller-updater",
 			"http-server",
 			"http-server-args",
@@ -227,6 +229,7 @@ func (s *ManifoldsSuite) TestMigrationGuardsUsed(c *gc.C) {
 		"central-hub",
 		"clock",
 		"controller-port",
+		"db-accessor",
 		"deployer",
 		"global-clock-updater",
 		"http-server",
@@ -300,6 +303,7 @@ func (*ManifoldsSuite) TestSingularGuardsUsed(c *gc.C) {
 		"upgrade-database-flag",
 		"upgrade-database-gate",
 		"upgrade-database-runner",
+		"db-accessor",
 	)
 
 	// Explicitly guarded by ifPrimaryController.
@@ -519,6 +523,12 @@ var expectedMachineManifoldsWithDependencies = map[string][]string{
 		"state-config-watcher",
 	},
 
+	"db-accessor": {
+		"agent",
+		"is-controller-flag",
+		"state-config-watcher",
+	},
+
 	"deployer": {
 		"agent",
 		"api-caller",