diff options
| author | hut <hut@lavabit.com> | 2010-05-14 17:27:04 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-05-14 17:27:04 +0200 |
| commit | 420d3d1af8d2991ae6a8cbe061adaab878c4b3ff (patch) | |
| tree | ad1cdc33cc12984c141618439b646424d8a76c25 /test/test.py | |
| parent | 792d6b23711c428a4a2b98537f44e2fbaed97fdd (diff) | |
| parent | 2f3326a41430364cb34a227d311691cada605327 (diff) | |
| download | ranger-420d3d1af8d2991ae6a8cbe061adaab878c4b3ff.tar.gz | |
Merge branch 'master' into cp
Conflicts: ranger/__main__.py
Diffstat (limited to 'test/test.py')
| -rw-r--r-- | test/test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test.py b/test/test.py index 5e8a9b9e..d0a69e5a 100644 --- a/test/test.py +++ b/test/test.py @@ -15,6 +15,6 @@ """Workaround to allow running single test cases directly""" try: - from __init__ import init, Fake, OK, raise_ok + from __init__ import init, Fake, OK, raise_ok, TODO except: - from test import init, Fake, OK, raise_ok + from test import init, Fake, OK, raise_ok, TODO |