gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r18635 - in gnunet/src/integration-tests: . confs


From: gnunet
Subject: [GNUnet-SVN] r18635 - in gnunet/src/integration-tests: . confs
Date: Fri, 16 Dec 2011 18:15:23 +0100

Author: wachs
Date: 2011-12-16 18:15:23 +0100 (Fri, 16 Dec 2011)
New Revision: 18635

Modified:
   gnunet/src/integration-tests/confs/c_nat_client.conf
   gnunet/src/integration-tests/gnunet_testing.py.in
   gnunet/src/integration-tests/test_integration_clique_nat.py.in
Log:


Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf        2011-12-16 
16:27:59 UTC (rev 18634)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf        2011-12-16 
17:15:23 UTC (rev 18635)
@@ -262,7 +262,7 @@
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist
+DEFAULTSERVICES = topology hostlist fs
 UNIXPATH = /tmp/test-service-arm-46
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES

Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in   2011-12-16 16:27:59 UTC 
(rev 18634)
+++ gnunet/src/integration-tests/gnunet_testing.py.in   2011-12-16 17:15:23 UTC 
(rev 18635)
@@ -116,8 +116,8 @@
         self.result = -1;
     def check(self):
         if (self.fulfilled == False):
-            self.result = self.peer.check (self.subsystem, self.name, 
self.value);
-            if (self.result == self.value):
+            self.result = self.peer.get_statistics_value (self.subsystem, 
self.name);
+            if (str(self.result) == str(self.value)):
                 self.fulfilled = True
                 return True
             else:
@@ -208,15 +208,15 @@
             return False
         self.started = False
         return True;
-    def check (self, subsystem, name, value):
+    def get_statistics_value (self, subsystem, name):
         from gnunet_pyexpect import pexpect
         server = pexpect ()
         server.spawn (None, [self.test.gnunetstatistics, '-c', self.cfg 
,'-q','-n', name, '-s', subsystem ], stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT)
         #server.expect ("stdout", re.compile (r""))
         test = server.read("stdout", 10240)
-        if (test.find(str(value)) == -1): 
+        tests = test.partition('\n')[0]
+        if (tests.isdigit() == True):
+            return tests
+        else:
             return -1
-        else:
-            return value  
-
         
\ No newline at end of file

Modified: gnunet/src/integration-tests/test_integration_clique_nat.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique_nat.py.in      
2011-12-16 16:27:59 UTC (rev 18634)
+++ gnunet/src/integration-tests/test_integration_clique_nat.py.in      
2011-12-16 17:15:23 UTC (rev 18635)
@@ -110,7 +110,6 @@
 
 
 def success_connect_cont (check):  
-    check.eval(False)
     check_disconnect_server ()
 
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]