← Back to branch summary

~radix/storm/cambridge-storm-talk

« back to all changes in this revision

Viewing changes to test

  • Committer: Jamu Kakar
  • Date: 2007-08-06 23:03:28 UTC
  • Revision ID: jkakar@kakar.ca-20070806230328-os7lartho5qx1x2o
Replaced code lost during conflict resolution to make trial work again
[trivial].

Show diffs side-by-side

added added

removed removed

Lines of Context:
test
88
88
 
89
89
def test_with_trial():
90
90
    from twisted.scripts import trial
91
 
    disable_conftest()
92
 
    if not [x for x in sys.argv[1:] if not x.startswith("-")]:
93
 
        for dir, dirs, files in os.walk("tests"):
94
 
            for file in files:
95
 
                if file.endswith(".py") and file != "__init__.py":
96
 
                    sys.argv.append(os.path.join(dir, file))
 
91
    unittests, doctests = find_tests(parse_sys_argv())
 
92
    sys.argv.extend(unittests)
97
93
    trial.run()
98
94
 
99
95