summary refs log tree commit diff stats
path: root/test
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2009-12-13 16:23:01 +0100
committerhut <hut@lavabit.com>2009-12-13 16:23:01 +0100
commit4c05e43d11430fbfd8a5d86ae0070e24775251b1 (patch)
tree1b7f269e3e1c025a06b08ca2396eaa9f228c3732 /test
parentf2d8598d2b0ce36a8f275800cd2d0164ec672abb (diff)
downloadranger-4c05e43d11430fbfd8a5d86ae0070e24775251b1.tar.gz
clean ups, comments
Diffstat (limited to 'test')
-rw-r--r--test/tc_directory.py11
-rw-r--r--test/tc_history.py2
2 files changed, 8 insertions, 5 deletions
diff --git a/test/tc_directory.py b/test/tc_directory.py
index cb8e747e..676ec0fe 100644
--- a/test/tc_directory.py
+++ b/test/tc_directory.py
@@ -1,10 +1,11 @@
 if __name__ == '__main__': from __init__ import init; init()
 
+from os.path import realpath, join, dirname
+
 from ranger import fsobject
 from ranger.fsobject.file import File
 from ranger.fsobject.directory import Directory
 
-from os.path import realpath, join, dirname
 TESTDIR = realpath(join(dirname(__file__), 'testdir'))
 TESTFILE = join(TESTDIR, 'testfile5234148')
 NONEXISTANT_DIR = join(TESTDIR, 'nonexistant')
@@ -34,7 +35,8 @@ class Test1(unittest.TestCase):
 		# Get the filenames you expect it to have and sort both before
 		# comparing. I don't expect any order after only loading the filenames.
 		assumed_filenames = os.listdir(TESTDIR)
-		assumed_filenames = list(map(lambda str: os.path.join(TESTDIR, str), assumed_filenames))
+		assumed_filenames = list(map(lambda str: os.path.join(TESTDIR, str),
+			assumed_filenames))
 		assumed_filenames.sort()
 		dir.filenames.sort()
 
@@ -67,7 +69,7 @@ class Test1(unittest.TestCase):
 		import os
 		import time
 		# modify the directory. If the time between the last modification
-		# was within the filesystems resolution of mtime, we should have a re-load.
+		# was within the filesystems resolution of mtime, we should have a reload
 
 		def modify_dir():
 			open(TESTFILE, 'w').close()
@@ -90,7 +92,8 @@ class Test1(unittest.TestCase):
 			time.sleep(0.1)
 		else:
 			# fail after 5 seconds of trying
-			self.fail("Cannot perform test: mtime of TESTDIR is not being updated.")
+			self.fail(
+					"Cannot perform test: mtime of TESTDIR is not being updated.")
 
 		self.assertTrue(dir.load_if_outdated())
 
diff --git a/test/tc_history.py b/test/tc_history.py
index ad340992..e3377532 100644
--- a/test/tc_history.py
+++ b/test/tc_history.py
@@ -5,7 +5,7 @@ from unittest import TestCase, main
 import unittest
 
 class Test(TestCase):
-	def test_everything(self):
+	def test_history(self):
 		hist = History(3)
 		for i in range(6):
 			hist.add(i)