Merge branch 'main' into fix/list-secrets

cderici · web-flow · commit aaf6de37e15c · 2024-07-11T12:42:00.000-06:00
diff --git a/juju/constraints.py b/juju/constraints.py
@@ -54,7 +54,7 @@
     "zones",
     "allocate_public_ip"]
 
-LIST_KEYS = {'tags', 'spaces'}
+LIST_KEYS = {'tags', 'spaces', 'zones'}
 
 SNAKE1 = re.compile(r'(.)([A-Z][a-z]+)')
 SNAKE2 = re.compile('([a-z0-9])([A-Z])')
diff --git a/tests/unit/test_constraints.py b/tests/unit/test_constraints.py
@@ -60,7 +60,7 @@ def test_parse_constraints(self):
         self.assertEqual(
             _("mem=10G zones=bar,baz tags=tag1 spaces=space1,space2"),
             {"mem": 10 * 1024,
-             "zones": "bar,baz",
+             "zones": ["bar", "baz"],
              "tags": ["tag1"],
              "spaces": ["space1", "space2"]}
         )

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ def test_parse_constraints(self):`
`60`	`60`	`self.assertEqual(`
`61`	`61`	`_("mem=10G zones=bar,baz tags=tag1 spaces=space1,space2"),`
`62`	`62`	`{"mem": 10 * 1024,`
`63`		`- "zones": "bar,baz",`
	`63`	`+ "zones": ["bar", "baz"],`
`64`	`64`	`"tags": ["tag1"],`
`65`	`65`	`"spaces": ["space1", "space2"]}`
`66`	`66`	`)`