diff --git a/bubble-server/src/test/resources/models/include/new_bubble.json b/bubble-server/src/test/resources/models/include/new_bubble.json index 3f6578e3..265ea289 100644 --- a/bubble-server/src/test/resources/models/include/new_bubble.json +++ b/bubble-server/src/test/resources/models/include/new_bubble.json @@ -165,50 +165,22 @@ }, { - "comment": "list DNS for the network, should now see a DNS A record for new instance", - "before": "await_url me/networks/<>/dns/find?type=A&name={{<>.host}}.<>.<> 40m 10s await_json.length > 0", - "request": { - "uri": "me/networks/<>/dns/find?type=A&name={{<>.host}}.<>.<>" - }, - "response": { - "store": "dnsRecords", - "check": [ - {"condition": "json.length == 1"} - ] - } - }, - - { - "comment": "call API of deployed node, ensure it is running", - "before": "await_url .bubble 40m 20s", + "comment": "call API of deployed node after some grace period, ensure it is running", + "before": "await_url .bubble 20m:40m 20s", "connection": { "name": "<>", "baseUri": "https://{{<>.host}}.<>.<>:{{serverConfig.nginxPort}}/api" }, "request": { "uri" : ".bubble" }, - "response": { - "raw": true, - "check": [ - {"condition": "response.json == 'you are ok. the magic is ok too.'"} - ] - } + "response": { "raw": true, "check": [{ "condition": "response.json == 'you are ok. the magic is ok too.'" }] } }, -// { -// "comment": "verify new node has said hello, and requested another node", -// "connection": { "name": "<>_connection" }, -// "request": { -// "session": "rootSession", -// "uri": "me/notifications/inbox" -// }, -// "response": { -// "check": [ -// {"condition": "json.length >= 2"}, -// {"condition": "_find(json, function (n) { n.getType().name() == 'upstream_hello' }) != null"}, -// {"condition": "_find(json, function (n) { n.getType().name() == 'new_node' }) != null"} -// ] -// } -// }, + { + "comment": "now list DNS for the network, should now see a DNS A record for new instance", + "connection": { "name": "<>" }, + "request": { "uri": "me/networks/<>/dns/find?type=A&name={{<>.host}}.<>.<>" }, + "response": { "store": "dnsRecords", "check": [{ "condition": "json.length == 1" }] } + }, { "comment": "login to deployed node",