Skip to content

Commit 900760e

Browse files
committed
tests: Increase Ansible timeout to reduce false positives
Was failing on my dsktop PC, with a spinning rust HDD
1 parent 526422b commit 900760e

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

tests/ansible/ansible.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ transport = ssh
3535
no_target_syslog = True
3636

3737
# Required by integration/ssh/timeouts.yml
38-
timeout = 10
38+
timeout = 30
3939

4040
# On Travis, paramiko check fails due to host key checking enabled.
4141
host_key_checking = False

tests/ansible/integration/connection_delegation/delegate_to_template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'kwargs': {
3434
'check_host_keys': 'ignore',
3535
'compression': True,
36-
'connect_timeout': 10,
36+
'connect_timeout': 30,
3737
'hostname': 'alias-host',
3838
'identities_only': False,
3939
'identity_file': null,
@@ -63,7 +63,7 @@
6363
'kwargs': {
6464
'check_host_keys': 'ignore',
6565
'compression': True,
66-
'connect_timeout': 10,
66+
'connect_timeout': 30,
6767
'hostname': 'cd-normal-alias',
6868
'identities_only': False,
6969
'identity_file': null,

tests/ansible/integration/connection_delegation/local_action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{
2323
'enable_lru': true,
2424
'kwargs': {
25-
'connect_timeout': 10,
25+
'connect_timeout': 30,
2626
'python_path': ["{{ansible_playbook_python}}"],
2727
'remote_name': null,
2828
'password': null,

tests/ansible/integration/connection_delegation/stack_construction.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
right: [
4242
{
4343
"kwargs": {
44-
"connect_timeout": 10,
44+
"connect_timeout": 30,
4545
"doas_path": null,
4646
"password": null,
4747
"python_path": ["/usr/bin/python"],
@@ -70,7 +70,7 @@
7070
'kwargs': {
7171
'check_host_keys': 'ignore',
7272
'compression': True,
73-
'connect_timeout': 10,
73+
'connect_timeout': 30,
7474
'hostname': 'alias-host',
7575
'identities_only': False,
7676
'identity_file': null,
@@ -115,7 +115,7 @@
115115
'kwargs': {
116116
'check_host_keys': 'ignore',
117117
'compression': True,
118-
'connect_timeout': 10,
118+
'connect_timeout': 30,
119119
'hostname': 'alias-host',
120120
'identities_only': False,
121121
'identity_file': null,
@@ -158,7 +158,7 @@
158158
right: [
159159
{
160160
'kwargs': {
161-
'connect_timeout': 10,
161+
'connect_timeout': 30,
162162
'doas_path': null,
163163
'password': null,
164164
"python_path": ["/usr/bin/python"],
@@ -171,7 +171,7 @@
171171
'kwargs': {
172172
'check_host_keys': 'ignore',
173173
'compression': True,
174-
'connect_timeout': 10,
174+
'connect_timeout': 30,
175175
'hostname': 'cd-normal-normal',
176176
'identities_only': False,
177177
'identity_file': null,
@@ -216,7 +216,7 @@
216216
'kwargs': {
217217
'check_host_keys': 'ignore',
218218
'compression': True,
219-
'connect_timeout': 10,
219+
'connect_timeout': 30,
220220
'hostname': 'alias-host',
221221
'identities_only': False,
222222
'identity_file': null,
@@ -246,7 +246,7 @@
246246
'kwargs': {
247247
'check_host_keys': 'ignore',
248248
'compression': True,
249-
'connect_timeout': 10,
249+
'connect_timeout': 30,
250250
'hostname': 'cd-normal-alias',
251251
'identities_only': False,
252252
'identity_file': null,
@@ -289,7 +289,7 @@
289289
right: [
290290
{
291291
'kwargs': {
292-
'connect_timeout': 10,
292+
'connect_timeout': 30,
293293
'doas_path': null,
294294
'password': null,
295295
"python_path": ["/usr/bin/python"],
@@ -302,7 +302,7 @@
302302
'kwargs': {
303303
'check_host_keys': 'ignore',
304304
'compression': True,
305-
'connect_timeout': 10,
305+
'connect_timeout': 30,
306306
'hostname': 'cd-newuser-normal-normal',
307307
'identities_only': False,
308308
'identity_file': null,
@@ -348,7 +348,7 @@
348348
'kwargs': {
349349
'check_host_keys': 'ignore',
350350
'compression': True,
351-
'connect_timeout': 10,
351+
'connect_timeout': 30,
352352
'hostname': 'alias-host',
353353
'identities_only': False,
354354
'identity_file': null,
@@ -412,7 +412,7 @@
412412
right: [
413413
{
414414
'kwargs': {
415-
'connect_timeout': 10,
415+
'connect_timeout': 30,
416416
'doas_path': null,
417417
'password': null,
418418
'python_path': ["/usr/bin/python"],
@@ -423,7 +423,7 @@
423423
},
424424
{
425425
'kwargs': {
426-
'connect_timeout': 10,
426+
'connect_timeout': 30,
427427
'doas_path': null,
428428
'password': null,
429429
'python_path': ["/usr/bin/python"],

tests/ansible/integration/ssh/timeouts.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
tasks:
66
- name: Cause Ansible connection timeout
77
connection: local
8+
environment:
9+
ANSIBLE_SSH_TIMEOUT: 10
810
command: |
911
ansible -vvv
1012
-i "{{MITOGEN_INVENTORY_FILE}}"

0 commit comments

Comments
 (0)