← Back to branch summary

~forest-bond/sclapp/dev

« back to all changes in this revision

Viewing changes to tests/output_protection.py

  • Committer: forest at alittletooquiet
  • Date: 2009-12-21 14:12:02 UTC
  • Revision ID: forest@alittletooquiet.net-20091221141202-zq72jtf9woeoojrm
Fix failing output protection test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/output_protection.py
109
109
  exceptions = ()):
110
110
    def test_fn():
111
111
        pid = failure_fn(main_fn)
112
 
        assertLogFileContainsExactly('foo', foos)
113
 
        assertLogFileContainsExactly('bar', bars)
 
112
        if foos is not None:
 
113
            assertLogFileContainsExactly('foo', foos)
 
114
        if bars is not None:
 
115
            assertLogFileContainsExactly('bar', bars)
114
116
        for signal in signals:
115
117
            assertSignalCaught(signal, pid)
116
118
        for exception in exceptions:
171
173
        'test_stdout_fails_without_signal_handling_without_output_protection',
172
174
        _stdout_fails,
173
175
        main_without_signal_handling_without_output_protection,
174
 
        2, 2, ()
 
176
        2, None, ()
175
177
    )))
176
178
    test_stdout_stderr_fail_without_signal_handling_without_output_protection = (
177
179
      staticmethod(_make_test_fn(