Merge lp:~maxb/udd/natty-test-fail into lp:udd

[Max Bowsher]

Fix test failure on natty by deleting the test concerned.

The behaviour change was caused by the subprocess module changing in Python 2.7. You may validate this by copying Python 2.6's subprocess.py to the udd directory, and observing that the test now passes.

Looking carefully at the asserts which fail, it turns out they were testing an unspecified characteristic of how some subprocess.py versions represented an early failure to read any data from the subprocess.

As they did not seem to have any bearing on the situation actually under test, I simply deleted the problem asserts.

[Martin Pool (mbp)]

review: Approve

=== modified file 'tests/test_mass_import.py'
--- tests/test_mass_import.py	2011-05-23 12:16:01 +0000
+++ tests/test_mass_import.py	2011-06-09 23:07:36 +0000
@@ -117,11 +117,6 @@
         # report None, whilst Python 2.7 will default the retcode to 0 if a
         # process exits but its own waitpid fails with ECHILD.
 
-        # Nothing in stdout/stderr. This means that subprocesses should
-        # handled SIGTERM to allow us to collect their data.
-        self.assertIs(None, sub.out)
-        self.assertIs(None, sub.err)
-
 
 class TestSubprocessMonitorWithScript(tests.TestCaseInTempDir):