From 1ff3fa2d954f9d1e74585ee6652339bb8a1aff4a Mon Sep 17 00:00:00 2001
From: Matthias Wachs <wachs@net.in.tum.de>
Date: Thu, 8 Dec 2011 17:22:03 +0000
Subject: [PATCH] -more

---
 .../confs/c_no_nat_client.conf                |   3 +-
 src/integration-tests/hostkeys/0000-hostkey   | Bin 0 -> 914 bytes
 src/integration-tests/hostkeys/0001-hostkey   | Bin 0 -> 914 bytes
 ...st_integration_bootstrap_and_connect.py.in | 153 ++++++++++--------
 4 files changed, 90 insertions(+), 66 deletions(-)
 create mode 100644 src/integration-tests/hostkeys/0000-hostkey
 create mode 100644 src/integration-tests/hostkeys/0001-hostkey

diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 908212c18..e103ba8fe 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -132,6 +132,7 @@ ATS_MIN_INTERVAL = 15000
 ATS_EXEC_INTERVAL = 30000
 
 [transport]
+#DEBUG = YES
 AUTOSTART = YES
 PORT = 20029
 HOSTNAME = localhost
@@ -274,7 +275,7 @@ HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-hostlist
 OPTIONS = -b
-SERVERS = http://v9.gnunet.org:58080/
+SERVERS = http://localhost:8080/
 HTTP-PROXY = 
 
 [core]
diff --git a/src/integration-tests/hostkeys/0000-hostkey b/src/integration-tests/hostkeys/0000-hostkey
new file mode 100644
index 0000000000000000000000000000000000000000..c3c2123867321504e744f85363007069257d9f3a
GIT binary patch
literal 914
zcmV;D18w{Rk^uk!0s#O3fB=910002M<?-D2qBgHxk^qbCZ0X*SuT}W!2o#YJ7?+nI
zt~nwm`h31r^q4W+FXC*1N`>dYm%!vSpn<n$VXJ_TD)*YJHf(XG2Cx+En%)HKy6IJ%
z8YXnZhwMt~4C6+&AF_Zealo|5$e^2Se8)!NakMge2Ayf#N!DaR@#1N69wNL@e=AWO
zawjLCpK#RS1x<qGkS>pzdwM)jr<m3eRKLIyXrdyMrlh3VM1|%9{A&;i3y#7g(8ieD
zny)l>Nm8`##${_k=WQ<<EJK?lWzQRfBM^;_^n#Lt<$&L8&<RP!W8JHW9V){s>p;Ez
z>vAvx-90cg&y<hTx20wbFZ-hb0Ttv<YL}k|-p04T`k_Gl{fN61H&0rT92J!~4OKZx
z;w+h(@V=Suy_--ZeBbym5rBS6*wNR=0A$5mS$5drsdcueUOy{Bcj|ooPC-Q64&1?x
zeb3B=JNL51AH)0g;AD=G;<hRV@EUA&lmA-8Lwvuh?e_O_C7b7b&fiPT(Zy~OC9(TV
zlz3E#8kUrO_Gtpb!tBWmO71K~Tm7z3)m<+@7=Il=%a}#ibx(EbQ1F&;d!2pc!2)QE
zkdhCwL9aAERrgOt)kq!&c%rFW^0X?c&P6<(5xhEmB+5Z{eP85<&0D6xF~jP#;@14D
z&rzY_BEYG+;Xu_J9oQ||S>H43G-O<`>ka0%eYK!X@p`c!kE$T?aX3}bU!FKsjPKkV
zVkwt<l==U<hMG9l`hNK3KC<G(<$>4t(rZaicAm^ZO)92&;Bv){EgA_+&`u{+Ll!;+
zO8()=<TG_HiJH5%a6!VmeHs<ap)NPG$reSFX9wplbC?rY4tm;HTirer##DtFtj0D-
zg4Ggo5zUi_IM6^d;sJPAEhu%Zr1!HSv*zS*Q8UmvVR4`tqNf(nI_7(Ff;&u^Abx0y
zJzgIyGT7TnCMFl|431WMzULrSDW0zfrDP^x_~9;tWipKjgn4+410l*GVGF#Ni03O!
z^pp&HA9L{OV6WK>S*0#c%w19%P83!@rD{u)xRs(21Yx;)5^$+xd$!umxmgu9GF7RK
zY0SU|Sr-b|y>n{{J0HtjV_}sq)TW)B{>t9?^A=q({f@h@5OH*O86!YO-_Wt|$M6Di
o&F7K!tWAWB_fUKS$a$u;mJWa_k3>yP%^>Z1u5d0!y+8d8qm=W--T(jq

literal 0
HcmV?d00001

diff --git a/src/integration-tests/hostkeys/0001-hostkey b/src/integration-tests/hostkeys/0001-hostkey
new file mode 100644
index 0000000000000000000000000000000000000000..871fc90edff5f67fa18ac4a003f211fdeb80ff66
GIT binary patch
literal 914
zcmV;D18w{Rk^uk!0s#O3fB=910002h+$u=E3K2ryJDBpmH4&yrkt?`GKX(S-vZIA(
zCliR60&#)W`)>h;j8LM&bfm~jujJb|5ucY*^Po&jPeDkTr|yi)=G(O8coh<?ZG=zA
zX6SCknkmejOmG$0W{ikKz@EYTYCc}xP@|uGY@YCHT!#|}h9FJ0*2)du>ISlI>G=)~
za@(C6V^m#*Xid*bc^&Hme*N46RR_v#qUz9H;jlqGreu%`<zge{&$nBIRV821`bXIF
zQ*`<MMFzFg@LAJ>aRC`5C=K+x$KAIp#vWTW855=XQ6F9B**Yf-?ueXj3=c&$JR4P`
zto%>dr{V)!ULbU+?fb_`6v%@C0Si0eT6>B8>l>Vi2*g8(<zI9&nw<&G_vGgUn(hLO
z`ngKhCNh>RE@m<`42ZaHLQSw1dlXX|&#N?~Pqt6q6F}L4lG*0P&^h1rCse}&cD_>@
zC$GEZPWwW|Bm(Av=SWIk0Xc|~xJYo%(HHl^pAL;v%e63KQO8{Nu?jaJIu->xVyNrr
z$R;|xB*-p3(>FxA7xA3OSv9B8bLI3oTxs0N7A{BAZ-unZQRXD61Cw!P$JG+aO@vzY
z5Y`py+79+N%f;DmJAAsadDf^jDu1QxY2y6fxu7o0IsC$BYi<myztG-<q;n_3G-ZxW
z<8STGt5N(C*6E{=Li{$_rTdAA*tzFh4^d#Br&$_$2cq5MNRS4(A*eAbO(li62IBJ}
zFm|s5*os9_GW?wEaC(W6p`nL;8RBR!{?l`T=(=_ksRCy#@fnKG<{Eo~@)wkTcp~!t
z%xN4|wq)-w4+>gInFPuDjNQ_`KK4v<tZkLm%-gNsWW90*(~n;gN7<);@);cNwFENB
z`Sc&<dj_|{$E!;0`=1eJlM)8o*F4Wp9;!h!)V`@u?812D4?<H!a56lQD#v{br?CoI
z#Zmj3JSbyA#Si_4vsH)T`q+i6hzkrtVImJY_{tVqN<~*KkY&Gl`1YDrI<7{(-<<>&
zBfLi1Y4iNs(wTdi<;3o-aZ-*Eqde}PQjs*l;F4OM5ht_*C!<dQw~{LX+tP1X_)F$+
zGD=$%5{txaqg|ARc*g@#_i^N4aYEMtck)UrMnnMTb$EH-8?Sor;6K?|vS6;vLR?(^
o<L(P?KI+s+KU7VreX2p^IFq82mdXOV)l(-;GD?wd4BAncDWD0&W&i*H

literal 0
HcmV?d00001

diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index 44e8df3df..e88c2988a 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -23,6 +23,7 @@ import os
 import subprocess
 import re
 import shutil
+import time
 
 #
 # This test tests if a fresh peer bootstraps from a hostlist server and then
@@ -31,80 +32,102 @@ import shutil
 
 #definitions
 
-def vpfrint (msg):
-    if verbose == True:
-        print msg
-
-
 testname = "test_integration_bootstrap_and_connect"
 verbose = True
+gnunetarm = ""
+#fix this!
+success = True
+timeout = 2
 
-# setup
-
-srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
-if gnunet_pyexpect_dir not in sys.path:
-  sys.path.append (gnunet_pyexpect_dir)
-
-from gnunet_pyexpect import pexpect
-
-if os.name == 'posix':
-  gnunetarm = 'gnunet-arm'
-elif os.name == 'nt':
-  gnunetarm = 'gnunet-arm.exe'
-
-if os.name == "nt":
-  shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
-else:
-  shutil.rmtree ("/tmp/" + testname, True)
-
-vpfrint ("Running " + testname)
+def vprintf (msg):
+    if verbose == True:
+        print msg
 
+def setup ():
+	srcdir = "../.."
+	gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
+	if gnunet_pyexpect_dir not in sys.path:
+	  sys.path.append (gnunet_pyexpect_dir)
+	
+	from gnunet_pyexpect import pexpect
+
+	global gnunetarm	
+	if os.name == 'posix':
+	  gnunetarm = 'gnunet-arm'
+	elif os.name == 'nt':
+	  gnunetarm = 'gnunet-arm.exe'
+	
+	if os.name == "nt":
+	  shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
+	else:
+	  shutil.rmtree ("/tmp/" + testname, True)
+
+def start ():
+	vprintf ("Starting bootstrap server & client")
+	try:
+	    server = subprocess.Popen ([gnunetarm, '-sq', '-c', './confs/c_bootstrap_server.conf'])
+	    server.communicate ()    
+	except OSError:
+	    print "Can not start bootstrap server, exiting..."
+	    exit (1)
+	try:
+	    client = subprocess.Popen ([gnunetarm, '-sq', '-c', 'confs/c_no_nat_client.conf'])
+	    client.communicate ()    
+	except OSError:
+	    print "Can not start bootstrap client, exiting..."
+	    exit (1)
+	vprintf ("Bootstrap server & client started")
+
+def stop ():
+	vprintf ("Shutting down bootstrap server")
+	try:
+	    server = subprocess.Popen ([gnunetarm, '-eq', '-c', './confs/c_bootstrap_server.conf'])
+	    server.communicate ()    
+	except OSError:
+	    print "Can not stop bootstrap server, exiting..."
+	    exit (1)
+	try:
+	    client = subprocess.Popen ([gnunetarm, '-eq', '-c', 'confs/c_no_nat_client.conf'])
+	    client.communicate ()    
+	except OSError:
+	    print "Can not stop bootstrap client, exiting..."
+	    exit (1)
+	vprintf ("Bootstrap server & client stopped")
+
+
+def cleanup ():
+	if os.name == "nt":
+	    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True)
+	else:
+	    shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True)
+
+def check ():
+	global success
+	global timeout
+	count = 1
+
+	while ((success == False) and (count < timeout)):
+		time.sleep(1)
+		count += 1 
 
+# 
+# Test execution
+# 
 
-# start nodes
+vprintf ("Running " + testname)
+setup ()
+start ()
 
-vpfrint ("Starting bootstrap server & client")
-try:
-    server = subprocess.Popen ([gnunetarm, '-sq', '-c', './confs/c_bootstrap_server.conf'])
-    server.communicate ()    
-except OSError:
-    print "Can not start bootstrap server, exiting..."
-    exit (1)
-try:
-    client = subprocess.Popen ([gnunetarm, '-sq', '-c', 'confs/c_no_nat_client.conf'])
-    client.communicate ()    
-except OSError:
-    print "Can not start bootstrap client, exiting..."
-    exit (1)
-vpfrint ("Bootstrap server & client started")
+check ()
 
+stop ()
+cleanup ()
 
-import time
-time.sleep(5)
-
-# shutdown
-vpfrint ("Shutting down bootstrap server")
-try:
-    server = subprocess.Popen ([gnunetarm, '-eq', '-c', './confs/c_bootstrap_server.conf'])
-    server.communicate ()    
-except OSError:
-    print "Can not stop bootstrap server, exiting..."
-    exit (1)
-try:
-    client = subprocess.Popen ([gnunetarm, '-eq', '-c', 'confs/c_no_nat_client.conf'])
-    client.communicate ()    
-except OSError:
-    print "Can not stop bootstrap client, exiting..."
-    exit (1)
-vpfrint ("Bootstrap server & client stopped")
-
-# clean up
-
-if os.name == "nt":
-    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True)
+if (success == False):
+	print ('Test failed')
+	exit (1)
 else:
-    shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True)
+	print ('Test successful')
+	exit (0)
 
-exit (0)
 
-- 
2.25.1