[GNUnet-SVN] r20434 - gnunet/src/integration-tests

[gnunet]

Author: grothoff
Date: 2012-03-11 08:25:04 +0100 (Sun, 11 Mar 2012)
New Revision: 20434

Modified:
   gnunet/src/integration-tests/gnunet_testing.py.in
Log:
-LRN:  Make gnunet_testing.py W32-compatible



Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in   2012-03-11 00:00:57 UTC 
(rev 20433)
+++ gnunet/src/integration-tests/gnunet_testing.py.in   2012-03-11 07:25:04 UTC 
(rev 20434)
@@ -224,7 +224,11 @@
         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)
-        tests = test.partition('\n')[0]
+        tests = test.partition('\n')
+        # On W32 GNUnet outputs with \r\n, rather than \n
+        if os.name == 'nt' and tests[1] == '\n' and tests[0][-1] == '\r':
+            tests = (tests[0][:-1], tests[1], tests[2])
+        tests = tests[0]
         if (tests.isdigit() == True):
             return tests
         else: