Commit aaf5308f319faa9880eae7bff77d04ce64b52c53
1 parent
4aad516422
Exists in
master
and in
3 other branches
Move F004 and F005 further down
Showing 1 changed file with 11 additions and 11 deletions
kea_testing.groovy
View file @
aaf5308
... | ... | @@ -97,17 +97,6 @@ |
97 | 97 | if (responseCode != '200') { |
98 | 98 | error("$testName: Returned status code = $responseCode when calling $url") |
99 | 99 | } |
100 | - testName = "KEA_F004" | |
101 | - url = "mqtt://${HOST_IP}:1883/test" | |
102 | - responseCode = sh(label: testName, script: "sleep 2 ; curl -d 1 $url & OUT=`curl -m 4 -s $url` ; echo $OUT", returnStdout: true) | |
103 | - if (responseCode != 'test1') { | |
104 | - error("$testName: Returned status code = $responseCode when running MQTT test on $url") | |
105 | - } | |
106 | - testName = "KEA_F005" | |
107 | - responseCode = sh(label: testName, script: "docker exec -ti kea_timescaledb psql -l -U postgres | grep -q kea ; echo \$?", returnStdout: true) | |
108 | - if (responseCode != '0') { | |
109 | - error("$testName: Returned status code = $responseCode when looking for presense of kea DB") | |
110 | - } | |
111 | 100 | testName = "KEA_F002" |
112 | 101 | url = "$APP_URL:13880/components/od" |
113 | 102 | responseCode = sh(label: testName, script: "curl -m 10 -sLI -w '%{http_code}' $url -o /dev/null", returnStdout: true) |
... | ... | @@ -119,6 +108,17 @@ |
119 | 108 | responseCode = sh(label: testName, script: "curl -m 10 -sLI -w '%{http_code}' $url -o /dev/null", returnStdout: true) |
120 | 109 | if (responseCode != '200') { |
121 | 110 | error("$testName: Returned status code = $responseCode when calling $url") |
111 | + } | |
112 | + testName = "KEA_F004" | |
113 | + url = "mqtt://${HOST_IP}:1883/test" | |
114 | + responseCode = sh(label: testName, script: "sleep 2 ; curl -d 1 $url & OUT=`curl -m 4 -s $url` ; echo $OUT", returnStdout: true) | |
115 | + if (responseCode != 'test1') { | |
116 | + error("$testName: Returned status code = $responseCode when running MQTT test on $url") | |
117 | + } | |
118 | + testName = "KEA_F005" | |
119 | + responseCode = sh(label: testName, script: "docker exec -ti kea_timescaledb psql -l -U postgres | grep -q kea ; echo \$?", returnStdout: true) | |
120 | + if (responseCode != '0') { | |
121 | + error("$testName: Returned status code = $responseCode when looking for presense of kea DB") | |
122 | 122 | } |
123 | 123 | testName = "KEA_F006" |
124 | 124 | url = "$APP_URL:3001" |