diff options
author | hut <hut@lavabit.com> | 2010-10-02 05:51:17 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2010-10-02 05:51:17 +0200 |
commit | a457053815d72ef5d7ccfedbfda02101665bdec6 (patch) | |
tree | 5ea00e015b6488f0874c626e61bc64c62e514b9c /test | |
parent | ba16a2e43a71f3ee1a66ffaf1613bb1cce1665fc (diff) | |
download | ranger-a457053815d72ef5d7ccfedbfda02101665bdec6.tar.gz |
a little restructuration
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 |