diff options
author | hut <hut@lavabit.com> | 2010-10-08 17:58:18 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2010-10-08 17:58:18 +0200 |
commit | 0ff9e377ec42c206631a3a14eb2b6beb6f7974d3 (patch) | |
tree | 22ffe5563e9e32055932a46dc299df07cb7b359c /test | |
parent | 2a8ba97dc9f883dc61a3ab083747c20c0385eb88 (diff) | |
parent | 6615467cb849207dd98fd307e4cc217cd05c9f09 (diff) | |
download | ranger-0ff9e377ec42c206631a3a14eb2b6beb6f7974d3.tar.gz |
Merge branch 'master' into cp
Conflicts: ranger/__init__.py ranger/core/fm.py ranger/core/main.py ranger/core/helper.py ranger/core/loader.py
Diffstat (limited to 'test')
-rw-r--r-- | test/tc_directory.py | 8 | ||||
-rw-r--r-- | test/tc_loader.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/tc_directory.py b/test/tc_directory.py index 754253b3..a43ac89d 100644 --- a/test/tc_directory.py +++ b/test/tc_directory.py @@ -24,7 +24,7 @@ from os.path import realpath, join, dirname from ranger import fsobject from ranger.fsobject.file import File from ranger.fsobject.directory import Directory -from ranger.shared.settings import SettingsAware +from ranger.core.shared import SettingsAware SettingsAware._setup() @@ -49,7 +49,7 @@ class Test1(unittest.TestCase): import os # Check whether the directory has the correct list of filenames. dir = Directory(TESTDIR) - dir.load_content() + dir.load_content(schedule=False) self.assertTrue(dir.exists) self.assertEqual(type(dir.filenames), list) @@ -78,8 +78,8 @@ class Test1(unittest.TestCase): def test_nonexistant_dir(self): dir = Directory(NONEXISTANT_DIR) - dir.load_content() - + dir.load_content(schedule=False) + self.assertTrue(dir.content_loaded) self.assertFalse(dir.exists) self.assertFalse(dir.accessible) diff --git a/test/tc_loader.py b/test/tc_loader.py index 5a2e5a68..a679a629 100644 --- a/test/tc_loader.py +++ b/test/tc_loader.py @@ -24,7 +24,7 @@ import os from os.path import realpath, join, dirname from testlib import Fake -from ranger.shared import FileManagerAware, SettingsAware +from ranger.core.shared import FileManagerAware, SettingsAware from ranger.core.loader import Loader from ranger.fsobject import Directory, File from ranger.ext.openstruct import OpenStruct |