You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/03/11 02:07:54 UTC
[4/5] mesos git commit: Fixed AppcImageFetcherTest for manifest
formatting.
Fixed AppcImageFetcherTest for manifest formatting.
Review: https://reviews.apache.org/r/44455/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/696b260e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/696b260e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/696b260e
Branch: refs/heads/master
Commit: 696b260ec203625da77fb03e0cf726dd644ab1e4
Parents: dd82b30
Author: Jojy Varghese <jo...@mesosphere.io>
Authored: Thu Mar 10 17:06:10 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Mar 10 17:06:10 2016 -0800
----------------------------------------------------------------------
src/tests/containerizer/provisioner_appc_tests.cpp | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/696b260e/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp
index b0442c7..4852ac9 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -510,16 +510,16 @@ protected:
stringify(server.self().address.ip),
server.self().address.port).get();
- return JSON::parse(
+ const string manifest = strings::format(
R"~(
{
"acKind": "ImageManifest",
- "acVersion": "0.6.1",
- "name": " + imageName + ",
- "labels": [
+ "acVersion": "0.6.1",
+ "name": "%s",
+ "labels": [
{
"name": "version",
- "value": "1.0.0"
+ "value": "latest"
},
{
"name": "arch",
@@ -530,13 +530,16 @@ protected:
"value": "linux"
}
],
- "annotations": [
+ "annotations": [
{
"name": "created",
"value": "1438983392"
}
]
- })~").get();
+ })~",
+ imageName).get();
+
+ return JSON::parse(manifest).get();
}
void prepareImage(