[Python-modules-commits] r23731 - in packages/nose/trunk/debian/patches (disable-unstable-tests)

[mitya57-guest at users.alioth.debian.org]

    Date: Tuesday, March 19, 2013 @ 16:14:43
  Author: mitya57-guest
Revision: 23731

d/patches/disable-unstable-tests:
- refresh
- remove hook that is no longer needed

Modified:
  packages/nose/trunk/debian/patches/disable-unstable-tests

Modified: packages/nose/trunk/debian/patches/disable-unstable-tests
===================================================================
--- packages/nose/trunk/debian/patches/disable-unstable-tests	2013-03-19 09:27:06 UTC (rev 23730)
+++ packages/nose/trunk/debian/patches/disable-unstable-tests	2013-03-19 16:14:43 UTC (rev 23731)
@@ -1,43 +1,25 @@
 Description: Disable some unstable tests in multiprocessing module
 Author: Dmitry Shachnev <mitya57 at gmail.com>
 Forwarded: not-needed
-Last-Update: 2013-02-22
+Last-Update: 2013-03-19
 
---- a/functional_tests/test_multiprocessing/test_concurrent_shared.py
-+++ b/functional_tests/test_multiprocessing/test_concurrent_shared.py
-@@ -1,6 +1,7 @@
- import os
- import sys
- import unittest
-+import nose
- 
- from test_multiprocessing import MPTestBase
- 
-@@ -22,6 +23,7 @@ class TestConcurrentShared(MPTestBase):
-         MPTestBase.setUp(self)
- 
-     def runTest(self):
-+        raise nose.SkipTest('disabled in Debian')
-         assert 'Ran 2 tests in 1.' in self.output, "make sure two tests use 1.x seconds (no more than 2 seconds)"
-         assert str(self.output).strip().endswith('OK')
- 
 --- a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
 +++ b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
-@@ -52,6 +52,7 @@ def get_log_content(logfile):
+@@ -59,6 +59,7 @@ def get_log_content(logfile):
      return content
  
  def test_keyboardinterrupt():
 +    raise nose.SkipTest('Disabled in Debian')
-     process, logfile = keyboardinterrupt('keyboardinterrupt.py')
+     process, logfile, _ = keyboardinterrupt('keyboardinterrupt.py')
      stdout, stderr = [s.decode('utf-8') for s in process.communicate(None)]
-     print stderr
-@@ -68,6 +69,7 @@ def test_keyboardinterrupt():
+     log = get_log_content(logfile)
+@@ -79,6 +80,7 @@ def test_keyboardinterrupt():
  
  
  def test_keyboardinterrupt_twice():
 +    raise nose.SkipTest('Disabled in Debian')
-     process, logfile = keyboardinterrupt('keyboardinterrupt_twice.py')
-     sleep(0.5)
+     process, logfile, killfile = keyboardinterrupt('keyboardinterrupt_twice.py')
+     waitForKillFile(killfile)
      os.killpg(process.pid, signal.SIGINT)
 --- a/functional_tests/test_multiprocessing/test_process_timeout.py
 +++ b/functional_tests/test_multiprocessing/test_process_timeout.py