diff options
Diffstat (limited to 'testing/tests/p2pnat')
| -rw-r--r-- | testing/tests/p2pnat/behind-same-nat/pretest.dat | 4 | ||||
| -rw-r--r-- | testing/tests/p2pnat/medsrv-psk/pretest.dat | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/testing/tests/p2pnat/behind-same-nat/pretest.dat b/testing/tests/p2pnat/behind-same-nat/pretest.dat index 912222eef..e17456f7a 100644 --- a/testing/tests/p2pnat/behind-same-nat/pretest.dat +++ b/testing/tests/p2pnat/behind-same-nat/pretest.dat @@ -11,4 +11,8 @@ carol::sleep 1 alice::ipsec start alice::sleep 1 venus::ipsec start +<<<<<<< HEAD venus::sleep 2 +======= +venus::sleep 4 +>>>>>>> upstream/4.5.1 diff --git a/testing/tests/p2pnat/medsrv-psk/pretest.dat b/testing/tests/p2pnat/medsrv-psk/pretest.dat index a5c9a2fbb..8ce29fcd5 100644 --- a/testing/tests/p2pnat/medsrv-psk/pretest.dat +++ b/testing/tests/p2pnat/medsrv-psk/pretest.dat @@ -16,4 +16,8 @@ carol::sleep 1 bob::ipsec start bob::sleep 1 alice::ipsec start +<<<<<<< HEAD alice::sleep 2 +======= +alice::sleep 4 +>>>>>>> upstream/4.5.1 |