summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@yahooinc.com>2022-06-28 12:42:08 +0200
committerAndreas Eriksen <andreer@yahooinc.com>2022-06-28 12:42:08 +0200
commite09f5440695a7b1e0c0bccb24453d1e165d6e9ec (patch)
tree105ba3868d324f45a16cece3db3f44fb7ef318a9 /controller-server
parente39df2776929f5043e7fb371c252cbc8d0156e66 (diff)
update more unit tests
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json7
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json7
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json7
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json7
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json7
5 files changed, 30 insertions, 5 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
index 63869ecfba8..85813f7fcfa 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
@@ -11,6 +11,11 @@
{
"at": 0,
"type": "info",
+ "message": "Deploying with CA signed certificate version 0"
+ },
+ {
+ "at": 0,
+ "type": "info",
"message": "Deployment successful."
},
{
@@ -49,7 +54,7 @@
}
]
},
- "lastId": 7,
+ "lastId": 8,
"steps": {
"deployReal": {
"status": "succeeded",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json
index 175c45eb2cd..4ffac2bf738 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json
@@ -6,6 +6,11 @@
{
"at": 0,
"type": "info",
+ "message": "Found endpoints:"
+ },
+ {
+ "at": 0,
+ "type": "info",
"message": "- dev.us-east-1"
},
{
@@ -20,7 +25,7 @@
}
]
},
- "lastId": 11,
+ "lastId": 12,
"steps": {
"deployReal": {
"status": "succeeded",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
index ba65b962a73..d275deef85b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
@@ -85,6 +85,11 @@
{
"at": 14503000,
"type": "info",
+ "message": "Deploying with CA signed certificate version 0"
+ },
+ {
+ "at": 14503000,
+ "type": "info",
"message": "Deployment successful."
},
{
@@ -160,7 +165,7 @@
}
]
},
- "lastId": 29,
+ "lastId": 30,
"steps": {
"deployTester": {
"status": "succeeded",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
index 5bf6822baff..9fc3ea6f426 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
@@ -100,6 +100,11 @@
{
"at": 0,
"type": "info",
+ "message": "Deploying with CA signed certificate version 0"
+ },
+ {
+ "at": 0,
+ "type": "info",
"message": "Deployment successful."
},
{
@@ -349,7 +354,7 @@
}
]
},
- "lastId": 66,
+ "lastId": 67,
"steps": {
"deployTester": {
"status": "succeeded",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json
index 588f8839ab7..b9be0d26408 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json
@@ -5,12 +5,17 @@
"deployReal": [
{
"at": 1000,
+ "type": "info",
+ "message": "Deploying with CA signed certificate version 0"
+ },
+ {
+ "at": 1000,
"type": "warning",
"message": "Failed to deploy application: ERROR!"
}
]
},
- "lastId": 1,
+ "lastId": 2,
"steps": {
"deployReal": {
"status": "failed",