diff options
author | ng0 <ng0@n0.is> | 2019-10-12 18:16:07 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-10-12 18:16:07 +0000 |
commit | a5f5e7ed9b07b902af4438d76087e034abcba9b2 (patch) | |
tree | 6f376f93f1c785103d0b30f54311a0f61d2bdced /src/integration-tests/test_integration_clique.py.in | |
parent | 8e827de2a1db34dfe15f5f9da2850ca469b5ecc3 (diff) | |
download | gnunet-a5f5e7ed9b07b902af4438d76087e034abcba9b2.tar.gz gnunet-a5f5e7ed9b07b902af4438d76087e034abcba9b2.zip |
format python
Diffstat (limited to 'src/integration-tests/test_integration_clique.py.in')
-rwxr-xr-x | src/integration-tests/test_integration_clique.py.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index 0444cf249..a23c025ca 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in | |||
@@ -11,7 +11,7 @@ | |||
11 | # WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | # WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | # Affero General Public License for more details. | 13 | # Affero General Public License for more details. |
14 | # | 14 | # |
15 | # You should have received a copy of the GNU Affero General Public License | 15 | # You should have received a copy of the GNU Affero General Public License |
16 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | # | 17 | # |
@@ -113,9 +113,13 @@ def check_connect(): | |||
113 | check.add(StatisticsCondition(client, 'dht', '# peers connected', 2)) | 113 | check.add(StatisticsCondition(client, 'dht', '# peers connected', 2)) |
114 | check.add(StatisticsCondition(client, 'fs', '# peers connected', 2)) | 114 | check.add(StatisticsCondition(client, 'fs', '# peers connected', 2)) |
115 | 115 | ||
116 | check.add(StatisticsCondition(client_nat, 'transport', '# peers connected', 2)) | 116 | check.add( |
117 | StatisticsCondition(client_nat, 'transport', '# peers connected', 2) | ||
118 | ) | ||
117 | check.add(StatisticsCondition(client_nat, 'core', '# peers connected', 2)) | 119 | check.add(StatisticsCondition(client_nat, 'core', '# peers connected', 2)) |
118 | check.add(StatisticsCondition(client_nat, 'topology', '# peers connected', 2)) | 120 | check.add( |
121 | StatisticsCondition(client_nat, 'topology', '# peers connected', 2) | ||
122 | ) | ||
119 | check.add(StatisticsCondition(client_nat, 'dht', '# peers connected', 2)) | 123 | check.add(StatisticsCondition(client_nat, 'dht', '# peers connected', 2)) |
120 | check.add(StatisticsCondition(client_nat, 'fs', '# peers connected', 2)) | 124 | check.add(StatisticsCondition(client_nat, 'fs', '# peers connected', 2)) |
121 | 125 | ||
@@ -127,6 +131,7 @@ def check_connect(): | |||
127 | 131 | ||
128 | check.run_blocking(check_timeout, success_cont, fail_cont) | 132 | check.run_blocking(check_timeout, success_cont, fail_cont) |
129 | 133 | ||
134 | |||
130 | # | 135 | # |
131 | # Test execution | 136 | # Test execution |
132 | # | 137 | # |
@@ -199,7 +204,8 @@ def run(): | |||
199 | cleanup() | 204 | cleanup() |
200 | sys.exit(success) | 205 | sys.exit(success) |
201 | 206 | ||
202 | if ((client.started == True) and (client_nat.started == True) and (server.started == True)): | 207 | if ((client.started == True) and (client_nat.started == True) |
208 | and (server.started == True)): | ||
203 | test.p('Peers started, running check') | 209 | test.p('Peers started, running check') |
204 | check_connect() | 210 | check_connect() |
205 | 211 | ||