projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix
[oweals/gnunet.git]
/
src
/
integration-tests
/
test_integration_clique.py.in
diff --git
a/src/integration-tests/test_integration_clique.py.in
b/src/integration-tests/test_integration_clique.py.in
index e1856ba2b5f8723d5acd7aeeb7ed204fdf869907..33a6da69391d0b92eeb9c1eca0d0c95d157432ea 100755
(executable)
--- a/
src/integration-tests/test_integration_clique.py.in
+++ b/
src/integration-tests/test_integration_clique.py.in
@@
-14,8
+14,8
@@
#
# You should have received a copy of the GNU General Public License
# along with GNUnet; see the file COPYING. If not, write to the
#
# You should have received a copy of the GNU General Public License
# along with GNUnet; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-# Boston, MA 0211
1-1307
, USA.
+# Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+# Boston, MA 0211
0-1301
, USA.
#
#
#
#
#
#
@@
-49,13
+49,23
@@
testname = "test_integration_clique"
verbose = True
check_timeout = 180
verbose = True
check_timeout = 180
+def cleanup_onerror (function, path, excinfo):
+ import stat
+ if not os.path.exists (path):
+ pass
+ elif not os.access(path, os.W_OK):
+ # Is the error an access error ?
+ os.chmod (path, stat.S_IWUSR)
+ function (path)
+ else:
+ raise
def cleanup ():
retries = 10
path = os.path.join (tmp, "c_bootstrap_server")
test.p ("Removing " + path)
while ((os.path.exists(path)) and (retries > 0)):
def cleanup ():
retries = 10
path = os.path.join (tmp, "c_bootstrap_server")
test.p ("Removing " + path)
while ((os.path.exists(path)) and (retries > 0)):
- shutil.rmtree ((path), False)
+ shutil.rmtree ((path), False
, cleanup_onerror
)
time.sleep (1)
retries -= 1
if (os.path.exists(path)):
time.sleep (1)
retries -= 1
if (os.path.exists(path)):
@@
-64,7
+74,7
@@
def cleanup ():
path = os.path.join (tmp, "c_no_nat_client")
test.p ("Removing " + path)
while ((os.path.exists(path)) and (retries > 0)):
path = os.path.join (tmp, "c_no_nat_client")
test.p ("Removing " + path)
while ((os.path.exists(path)) and (retries > 0)):
- shutil.rmtree ((path), False)
+ shutil.rmtree ((path), False
, cleanup_onerror
)
time.sleep (1)
retries -= 1
if (os.path.exists(path)):
time.sleep (1)
retries -= 1
if (os.path.exists(path)):
@@
-73,7
+83,7
@@
def cleanup ():
path = os.path.join (tmp, "c_nat_client")
test.p ("Removing " + path)
while ((os.path.exists(path)) and (retries > 0)):
path = os.path.join (tmp, "c_nat_client")
test.p ("Removing " + path)
while ((os.path.exists(path)) and (retries > 0)):
- shutil.rmtree ((path), False)
+ shutil.rmtree ((path), False
, cleanup_onerror
)
time.sleep (1)
retries -= 1
if (os.path.exists(path)):
time.sleep (1)
retries -= 1
if (os.path.exists(path)):
@@
-158,6
+168,9
@@
def run ():
cleanup ()
sys.exit(success)
cleanup ()
sys.exit(success)
+ # Server has to settle down
+ time.sleep(5)
+
client = Peer(test, './confs/c_no_nat_client.conf');
if (True != client.start()):
print 'Failed to start client'
client = Peer(test, './confs/c_no_nat_client.conf');
if (True != client.start()):
print 'Failed to start client'
@@
-168,6
+181,10
@@
def run ():
cleanup ()
sys.exit(success)
cleanup ()
sys.exit(success)
+ # Server has to settle down
+ time.sleep(5)
+
+
client_nat = Peer(test, './confs/c_nat_client.conf');
if (True != client_nat.start()):
print 'Failed to start client_nat'
client_nat = Peer(test, './confs/c_nat_client.conf');
if (True != client_nat.start()):
print 'Failed to start client_nat'