[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31485 - in gnunet/src/integration-tests: . confs hostkeys
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r31485 - in gnunet/src/integration-tests: . confs hostkeys |
|
Date: |
Tue, 17 Dec 2013 17:14:26 +0100 |
Author: wachs
Date: 2013-12-17 17:14:26 +0100 (Tue, 17 Dec 2013)
New Revision: 31485
Removed:
gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
gnunet/src/integration-tests/hostkeys/0004-hostkey
gnunet/src/integration-tests/hostkeys/0005-hostkey
gnunet/src/integration-tests/hostkeys/0006-hostkey
gnunet/src/integration-tests/hostkeys/0007-hostkey
gnunet/src/integration-tests/hostkeys/0008-hostkey
gnunet/src/integration-tests/hostkeys/0009-hostkey
Modified:
gnunet/src/integration-tests/Makefile.am
gnunet/src/integration-tests/confs/c_no_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
gnunet/src/integration-tests/test_integration_clique.py.in
gnunet/src/integration-tests/test_integration_disconnect.py.in
gnunet/src/integration-tests/test_integration_reconnect.py.in
gnunet/src/integration-tests/test_integration_reconnect_nat.py.in
Log:
clique test
removed unusued confs, tests
Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am 2013-12-17 15:44:13 UTC (rev
31484)
+++ gnunet/src/integration-tests/Makefile.am 2013-12-17 16:14:26 UTC (rev
31485)
@@ -18,10 +18,8 @@
test_integration_bootstrap_and_connect.py \
test_integration_disconnect.py \
test_integration_reconnect.py \
- test_integration_reconnect_nat.py
-# test_integration_bootstrap_and_connect_and_disconnect.py \
-# test_integration_bootstrap_and_connect_and_disconnect_nat.py \
-# test_integration_clique.py \
+ test_integration_reconnect_nat.py \
+ test_integration_clique.py
# test_integration_clique_nat.py \
# test_integration_connect_on_restart.py
endif
@@ -64,29 +62,10 @@
$(do_subst) < $(srcdir)/test_integration_reconnect_nat.py.in >
test_integration_reconnect_nat.py
chmod +x test_integration_reconnect_nat.py
+test_integration_clique.py: test_integration_clique.py.in Makefile
+ $(do_subst) < $(srcdir)/test_integration_clique.py.in >
test_integration_clique.py
+ chmod +x test_integration_clique.py
-
-
-#test_integration_bootstrap_and_connect_and_disconnect.py:
test_integration_bootstrap_and_connect_and_disconnect.py.in Makefile
-# $(do_subst) <
$(srcdir)/test_integration_bootstrap_and_connect_and_disconnect.py.in >
test_integration_bootstrap_and_connect_and_disconnect.py
-# chmod +x test_integration_bootstrap_and_connect_and_disconnect.py
-
-#test_integration_bootstrap_and_connect_and_disconnect_nat.py:
test_integration_bootstrap_and_connect_and_disconnect_nat.py.in Makefile
-# $(do_subst) <
$(srcdir)/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in >
test_integration_bootstrap_and_connect_and_disconnect_nat.py
-# chmod +x test_integration_bootstrap_and_connect_and_disconnect_nat.py
-
-
-
-#test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in
Makefile
-# $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in >
test_integration_disconnect_nat.py
-# chmod +x test_integration_disconnect_nat.py
-
-
-
-#test_integration_clique.py: test_integration_clique.py.in Makefile
-# $(do_subst) < $(srcdir)/test_integration_clique.py.in >
test_integration_clique.py
-# chmod +x test_integration_clique.py
-
#test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile
# $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in >
test_integration_clique_nat.py
# chmod +x test_integration_clique_nat.py
@@ -100,13 +79,10 @@
gnunet_testing.py.in \
gnunet_pyexpect.py.in \
test_integration_bootstrap_and_connect.py.in \
- test_integration_bootstrap_and_connect_and_disconnect.py.in \
- test_integration_bootstrap_and_connect_and_disconnect_nat.py.in \
- test_integration_connect_on_restart.py.in \
test_integration_disconnect.py.in \
test_integration_reconnect.py.in \
+ test_integration_reconnect_nat.py.in \
test_integration_clique.py.in \
- test_integration_clique_nat.py.in \
confs/test_defaults.conf \
confs/c_bootstrap_server.conf \
confs/c_nat_client.conf \
@@ -115,14 +91,8 @@
hostkeys/c_bootstrap_server \
hostkeys/c_no_nat_client \
hostkeys/c_no_nat_client_2 \
- hostkeys/c_nat_client \
- hostkeys/0004-hostkey \
- hostkeys/0005-hostkey \
- hostkeys/0006-hostkey \
- hostkeys/0007-hostkey \
- hostkeys/0008-hostkey \
- hostkeys/0009-hostkey
-# test_integration_disconnect_nat.py
+ hostkeys/c_nat_client
+# test_integration_clique_nat.py.in
CLEANFILES = \
$(check_SCRIPTS) \
Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf 2013-12-17
15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf 2013-12-17
16:14:26 UTC (rev 31485)
@@ -82,7 +82,6 @@
PORT = 20023
[vpn]
-BINARY = gnunet-service-vpn
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
[dv]
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2013-12-17
15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2013-12-17
16:14:26 UTC (rev 31485)
@@ -1,95 +1,117 @@
@INLINE@ confs/test_defaults.conf
+[PATHS]
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
+
+[PEER]
+PRIVATE_KEY = hostkeys/c_no_nat_client_2
+
+
+[transport]
+PLUGINS = tcp udp http_client https_client
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
+PORT = 20039
+
+[transport-tcp]
+PORT = 20038
+ADVERTISED_PORT = 20038
+
+[transport-udp]
+PORT = 20027
+BROADCAST_INTERVAL = 30 s
+
+[hostlist]
+SERVERS = http://localhost:8080/
+
+[nat]
+BEHIND_NAT = NO
+DISABLEV6 = NO
+
+
[arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
-PORT = 20040
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
+PORT = 20022
+[namestore]
+AUTOSTART = YES
+
[dns]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
+[consensus]
+AUTOSTART = YES
+
[lockmanager]
AUTOSTART = YES
[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
-PORT = 20039
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
+PORT = 20021
[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
-PORT = 20048
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+PORT = 20030
[mesh]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
-PORT = 20052
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
+PORT = 20034
[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
-PORT = 20050
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
+PORT = 20032
[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
-PORT = 20053
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
+PORT = 20035
[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
-PORT = 20036
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
+PORT = 20018
-[nat]
-BEHIND_NAT = NO
+[dhtcache]
+DATABASE = heap
+QUOTA = 50 MB
[gnunet-nat-server]
-PORT = 20038
+PORT = 20020
[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
-PORT = 20041
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
+PORT = 20023
-[transport]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
-PORT = 20047
-
-[transport-tcp]
-PORT = 20046
-ADVERTISED_PORT = 20046
-
-[transport-udp]
-PORT = 20045
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
[vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
[dv]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-2
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-1
[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
-PORT = 20049
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
+USE_INCLUDED_HELLOS = YES
+PORT = 20031
[statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
-PORT = 20037
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
+PORT = 20019
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = c_no_nat_client_2.conf
-
-[PEER]
-PRIVATE_KEY = hostkeys/c_no_nat_client_2
-
[template]
-PORT = 20042
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
+PORT = 20024
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
-PORT = 20051
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
+UNIX_MATCH_UID = NO
+WORKBITS = 22
+PORT = 20033
-[transport-http]
-PORT = 20044
+[gns]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-gns-35
+PORT = 20038
-[transport-https]
-PORT = 20043
+[dv]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-36
+PORT = 20039
+
Deleted: gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-12-17
15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-12-17
16:14:26 UTC (rev 31485)
@@ -1,62 +0,0 @@
address@hidden@ confs/test_defaults.conf
-
-[arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
-PORT = 20058
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
-PORT = 20057
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
-PORT = 20066
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
-PORT = 20068
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
-PORT = 20071
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
-PORT = 20054
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
-PORT = 20059
-
-[transport]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
-PORT = 20065
-
-[transport-tcp]
-PORT = 0
-ADVERTISED_PORT = 20064
-
-[transport-udp]
-PORT = 0
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
-USE_INCLUDED_HELLOS = YES
-PORT = 20067
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_normal_client
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
-PORT = 20069
-
-[gnunetd]
-HOSTKEY = hostkeys/0002-hostkey
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 0
-
Deleted: gnunet/src/integration-tests/hostkeys/0004-hostkey
===================================================================
(Binary files differ)
Deleted: gnunet/src/integration-tests/hostkeys/0005-hostkey
===================================================================
(Binary files differ)
Deleted: gnunet/src/integration-tests/hostkeys/0006-hostkey
===================================================================
(Binary files differ)
Deleted: gnunet/src/integration-tests/hostkeys/0007-hostkey
===================================================================
(Binary files differ)
Deleted: gnunet/src/integration-tests/hostkeys/0008-hostkey
===================================================================
(Binary files differ)
Deleted: gnunet/src/integration-tests/hostkeys/0009-hostkey
===================================================================
(Binary files differ)
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2013-12-17 15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2013-12-17 16:14:26 UTC (rev 31485)
@@ -120,7 +120,7 @@
print 'Test was aborted!'
if (None != server):
server.stop ()
- if (None != server):
+ if (None != client):
client.stop ()
cleanup ()
sys.exit(success)
Modified: gnunet/src/integration-tests/test_integration_clique.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique.py.in 2013-12-17
15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/test_integration_clique.py.in 2013-12-17
16:14:26 UTC (rev 31485)
@@ -19,12 +19,14 @@
#
#
#
-# This test starts 3 peers and expects bootstrap and a connected clique
+# This test starts 3 peers (nated, server, no nat)and expects bootstrap
+# and a connected clique
#
# Conditions for successful exit:
-# Both peers have 1 connected peer in transport, core, topology, fs
+# Both peers have 2 connected peers in transport, core, topology, fs and dht
import sys
+import signal
import os
import subprocess
import re
@@ -68,7 +70,7 @@
if (os.path.exists(path)):
test.p ("Failed to remove " + path)
retries = 10
- path = os.path.join (tmp, "c_no_nat_client_2")
+ path = os.path.join (tmp, "c_nat_client")
test.p ("Removing " + path)
while ((os.path.exists(path)) and (retries > 0)):
shutil.rmtree ((path), False)
@@ -81,118 +83,110 @@
def success_cont (check):
global success
success = True;
+ print 'Connected clique successfully'
def fail_cont (check):
global success
success= False;
- check.evaluate(True)
-
-
-def check_disconnect_client ():
- test.p ('Shutting down bootstrap client')
- client.stop ()
- check = Check (test)
-
- check.add (StatisticsCondition (client2, 'transport', '# peers connected',0))
- check.add (StatisticsCondition (client2, 'core', '# neighbour entries
allocated',0))
- check.add (StatisticsCondition (client2, 'core', '# peers connected',0))
- check.add (StatisticsCondition (client2, 'topology', '# peers connected',0))
- check.add (StatisticsCondition (client2, 'fs', '# peers connected',0))
-
- check.run_blocking (check_timeout, success_cont, fail_cont)
-
-
-def success_disconnect_server_cont (check):
- check_disconnect_client ()
-
-
-def fail_disconnect_server_cont (check):
- global success
- success= False;
- check.evaluate(True)
-
-
-def check_disconnect_server ():
- test.p ('Shutting down bootstrap server')
- server.stop ()
- check = Check (test)
- check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
- check.add (StatisticsCondition (client, 'core', '# neighbour entries
allocated',1))
- check.add (StatisticsCondition (client, 'core', '# peers connected',1))
- check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
- check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
-
- check.add (StatisticsCondition (client2, 'transport', '# peers connected',1))
- check.add (StatisticsCondition (client2, 'core', '# neighbour entries
allocated',1))
- check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
- check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
- check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))
-
- check.run_blocking (check_timeout, success_disconnect_server_cont,
fail_disconnect_server_cont)
-
-
-def success_connect_cont (check):
- check_disconnect_server ()
-
-
-def fail_connect_cont (check):
- global success
- success= False;
check.evaluate(True)
+ print 'Failed to connect clique'
-
def check_connect ():
check = Check (test)
check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
check.add (StatisticsCondition (client, 'core', '# neighbour entries
allocated',2))
check.add (StatisticsCondition (client, 'core', '# peers connected',2))
check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
+ check.add (StatisticsCondition (client, 'dht', '# peers connected',2))
check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
- check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
- check.add (StatisticsCondition (client2, 'core', '# neighbour entries
allocated',2))
- check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
- check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
- check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
+ check.add (StatisticsCondition (client_nat, 'transport', '# peers
connected',2))
+ check.add (StatisticsCondition (client_nat, 'core', '# neighbour entries
allocated',2))
+ check.add (StatisticsCondition (client_nat, 'core', '# peers connected',2))
+ check.add (StatisticsCondition (client_nat, 'topology', '# peers
connected',2))
+ check.add (StatisticsCondition (client_nat, 'dht', '# peers connected',2))
+ check.add (StatisticsCondition (client_nat, 'fs', '# peers connected',2))
check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
check.add (StatisticsCondition (server, 'core', '# neighbour entries
allocated',2))
check.add (StatisticsCondition (server, 'core', '# peers connected',2))
check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
+ check.add (StatisticsCondition (server, 'dht', '# peers connected',2))
check.add (StatisticsCondition (server, 'fs', '# peers connected',2))
- check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont)
+ check.run_blocking (check_timeout, success_cont, fail_cont)
#
# Test execution
#
+
+def SigHandler(signum = None, frame = None):
+ global success
+ global server
+ global client
+ global client_nat
+
+ print 'Test was aborted!'
+ if (None != server):
+ server.stop ()
+ if (None != client):
+ client.stop ()
+ if (None != client_nat):
+ client_nat.stop ()
+ cleanup ()
+ sys.exit(success)
+
def run ():
global success
global test
global server
global client
- global client2
+ global client_nat
success = False
- test = Test ('test_integration_disconnect', verbose)
+ server = None
+ client = None
+ client_nat = None
+ test = Test ('test_integration_clique', verbose)
cleanup ()
server = Peer(test, './confs/c_bootstrap_server.conf');
- server.start();
+ if (True != server.start()):
+ print 'Failed to start server'
+ if (None != server):
+ server.stop ()
+ cleanup ()
+ sys.exit(success)
client = Peer(test, './confs/c_no_nat_client.conf');
- client.start();
+ if (True != client.start()):
+ print 'Failed to start client'
+ if (None != server):
+ server.stop ()
+ if (None != client):
+ client.stop ()
+ cleanup ()
+ sys.exit(success)
- client2 = Peer(test, './confs/c_no_nat_client_2.conf');
- client2.start();
+ client_nat = Peer(test, './confs/c_nat_client.conf');
+ if (True != client_nat.start()):
+ print 'Failed to start client_nat'
+ if (None != server):
+ server.stop ()
+ if (None != client):
+ client.stop ()
+ if (None != client_nat):
+ client_nat.stop ()
+ cleanup ()
+ sys.exit(success)
- if ((client.started == True) and (client2.started == True) and
(server.started == True)):
+ if ((client.started == True) and (client_nat.started == True) and
(server.started == True)):
test.p ('Peers started, running check')
check_connect ()
server.stop ()
client.stop ()
- client2.stop ()
+ client_nat.stop ()
cleanup ()
@@ -209,7 +203,7 @@
print 'Test interrupted'
server.stop ()
client.stop ()
- client2.stop ()
+ client_nat.stop ()
cleanup ()
if (success == False):
sys.exit(1)
Modified: gnunet/src/integration-tests/test_integration_disconnect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_disconnect.py.in
2013-12-17 15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/test_integration_disconnect.py.in
2013-12-17 16:14:26 UTC (rev 31485)
@@ -123,7 +123,7 @@
print 'Test was aborted!'
if (None != server):
server.stop ()
- if (None != server):
+ if (None != client):
client.stop ()
cleanup ()
sys.exit(success)
@@ -151,15 +151,13 @@
print 'Failed to start server'
if (None != server):
server.stop ()
- if (None != server):
- client.stop ()
cleanup ()
sys.exit(success)
if (True != client.start()):
print 'Failed to start client'
if (None != server):
server.stop ()
- if (None != server):
+ if (None != client):
client.stop ()
cleanup ()
sys.exit(success)
Modified: gnunet/src/integration-tests/test_integration_reconnect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_reconnect.py.in
2013-12-17 15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/test_integration_reconnect.py.in
2013-12-17 16:14:26 UTC (rev 31485)
@@ -152,7 +152,7 @@
print 'Test was aborted!'
if (None != server):
server.stop ()
- if (None != server):
+ if (None != client):
client.stop ()
cleanup ()
sys.exit(success)
Modified: gnunet/src/integration-tests/test_integration_reconnect_nat.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_reconnect_nat.py.in
2013-12-17 15:44:13 UTC (rev 31484)
+++ gnunet/src/integration-tests/test_integration_reconnect_nat.py.in
2013-12-17 16:14:26 UTC (rev 31485)
@@ -152,7 +152,7 @@
print 'Test was aborted!'
if (None != server):
server.stop ()
- if (None != server):
+ if (None != client):
client.stop ()
cleanup ()
sys.exit(success)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31485 - in gnunet/src/integration-tests: . confs hostkeys,
gnunet <=