diff options
| author | David Bremner <david@tethera.net> | 2017-10-07 08:10:59 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-10-07 08:10:59 -0300 |
| commit | 45c9de36bc1abef8dd9807acd0e708b281c5ee6e (patch) | |
| tree | a6b27d4c5f9a84945f826a492c03fc0f408eb7d8 /debian | |
| parent | e27114edff2f593438b8040fab98a7e25a557f45 (diff) | |
debian: re-export patches
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/0001-Remove-race-conditions-from-tests.patch | 16 | ||||
| -rw-r--r-- | debian/patches/0005-Provide-for-etc-mailname.patch | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches/0001-Remove-race-conditions-from-tests.patch b/debian/patches/0001-Remove-race-conditions-from-tests.patch index 0015a42..a4b578a 100644 --- a/debian/patches/0001-Remove-race-conditions-from-tests.patch +++ b/debian/patches/0001-Remove-race-conditions-from-tests.patch @@ -3,38 +3,38 @@ Date: Sat, 2 Sep 2017 09:57:43 -0300 Subject: Remove race conditions from tests Testing the qmqp protocol fails because the testing server cannot -acquire the lock. This is solved by sleeping for one second so the -previous server has time to exit gracefully and clear the lock. Also, -sleep before removing temporary directories. +acquire the lock. This is solved by waiting for the previous +server to exit gracefully and clear the lock. Similarly, wait +before removing temporary directories. Forwarded: no -Last-Update: 2017-08-31 +Last-Update: 2017-10-07 --- test/functions.in | 1 + test/tests/protocols | 1 + 2 files changed, 2 insertions(+) diff --git a/test/functions.in b/test/functions.in -index 0ce02bd..3d06da5 100644 +index 0ce02bd..2a8ab8d 100644 --- a/test/functions.in +++ b/test/functions.in @@ -20,6 +20,7 @@ exit_cleanup() { # Remove all temporary files on success if [ $? -eq 0 ] then -+ sleep 1 ++ wait rm -rf $tmpdir fi } diff --git a/test/tests/protocols b/test/tests/protocols -index 49ca530..556a14a 100644 +index 49ca530..2678844 100644 --- a/test/tests/protocols +++ b/test/tests/protocols @@ -66,6 +66,7 @@ do echo "Testing protocol failure with $p." error 11 protocol $p -p $port --host=localhost 3<testmail stop server -+ sleep 1 ++ wait done rm -f testmail diff --git a/debian/patches/0005-Provide-for-etc-mailname.patch b/debian/patches/0005-Provide-for-etc-mailname.patch index ea44d9f..006a2c4 100644 --- a/debian/patches/0005-Provide-for-etc-mailname.patch +++ b/debian/patches/0005-Provide-for-etc-mailname.patch @@ -97,7 +97,7 @@ index 43fe26e..9c6b715 100644 me = "me"; } diff --git a/test/functions.in b/test/functions.in -index 3d06da5..32da9e5 100644 +index 2a8ab8d..18dcc6b 100644 --- a/test/functions.in +++ b/test/functions.in @@ -128,6 +128,6 @@ splitblank() { |