launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #25250
[Merge] ~cjwatson/launchpad-buildd:test-ordered-build-args into launchpad-buildd:master
Colin Watson has proposed merging ~cjwatson/launchpad-buildd:test-ordered-build-args into launchpad-buildd:master.
Commit message:
Ensure reliable test ordering of build_args
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/390228
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:test-ordered-build-args into launchpad-buildd:master.
diff --git a/lpbuildd/tests/test_oci.py b/lpbuildd/tests/test_oci.py
index 6079634..bdea5f5 100644
--- a/lpbuildd/tests/test_oci.py
+++ b/lpbuildd/tests/test_oci.py
@@ -3,6 +3,7 @@
__metaclass__ = type
+from collections import OrderedDict
import io
import json
import os
@@ -195,7 +196,7 @@ class TestOCIBuildManagerIteration(TestCase):
"git_repository": "https://git.launchpad.dev/~example/+git/snap",
"git_path": "master",
"build_file": "build-aux/Dockerfile",
- "build_args": {"VAR1": "xxx", "VAR2": "yyy"}
+ "build_args": OrderedDict([("VAR1", "xxx"), ("VAR2", "yyy")]),
}
expected_options = [
"--git-repository", "https://git.launchpad.dev/~example/+git/snap",