summary refs log tree commit diff stats
path: root/test
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-10-02 05:51:17 +0200
committerhut <hut@lavabit.com>2010-10-02 05:51:17 +0200
commita457053815d72ef5d7ccfedbfda02101665bdec6 (patch)
tree5ea00e015b6488f0874c626e61bc64c62e514b9c /test
parentba16a2e43a71f3ee1a66ffaf1613bb1cce1665fc (diff)
downloadranger-a457053815d72ef5d7ccfedbfda02101665bdec6.tar.gz
a little restructuration
Diffstat (limited to 'test')
-rw-r--r--test/tc_directory.py8
-rw-r--r--test/tc_loader.py2
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
pan class='oid'>a05beb6 ^
896f08d ^
a05beb6 ^

1076f2b


1076f2b
439e15d ^
1076f2b

366d81e ^


586f663 ^

366d81e ^

1076f2b
439e15d ^
3399650 ^
1076f2b
439e15d ^
3399650 ^
439e15d ^
1076f2b
3399650 ^
d6e0e6e ^
39677ec ^

3399650 ^
39677ec ^
439e15d ^


366d81e ^
586f663 ^


2a0fc84 ^
366d81e ^
439e15d ^
0053620 ^
3399650 ^



d6e0e6e ^
b9da4b0 ^
a05beb6 ^
2a0fc84 ^
3399650 ^

b9da4b0 ^
439e15d ^
366d81e ^

16c67f3 ^
366d81e ^
b9da4b0 ^



1076f2b
0053620 ^
3399650 ^

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93