Changeset 764
- Timestamp:
- 08/05/08 13:15:57 (4 months ago)
- Files:
-
- oss/amplee/amplee/test/test_indexer.py (modified) (10 diffs)
- oss/amplee/amplee/test/test_path.py (modified) (3 diffs)
- oss/amplee/amplee/test/test_storage_fs.py (modified) (2 diffs)
- oss/amplee/amplee/test/test_storage_svn.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
oss/amplee/amplee/test/test_indexer.py
r614 r764 2 2 import os, os.path 3 3 import time 4 import tempfile 4 5 #from sets import Set 5 6 from datetime import datetime … … 37 38 ixer.process(member) 38 39 39 if os.path.exists( '/tmp/cache0.p'):40 os.unlink( '/tmp/cache0.p')40 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache0.p')): 41 os.unlink(os.path.join(tempfile.gettempdir(), 'cache0.p')) 41 42 42 43 ixer.shutdown() … … 68 69 ixer = Indexer() 69 70 70 container = ShelveContainer( '/tmp/cache0.p')71 container = ShelveContainer(os.path.join(tempfile.gettempdir(), 'cache0.p')) 71 72 ai = AuthorIndex('ai', container=container) 72 73 ixer.register(ai) … … 83 84 self.assertEqual(ai.lookup('Jon Doe'), set()) 84 85 85 if os.path.exists( '/tmp/cache0.p'):86 os.unlink( '/tmp/cache0.p')86 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache0.p')): 87 os.unlink(os.path.join(tempfile.gettempdir(), 'cache0.p')) 87 88 88 89 ixer.shutdown() … … 91 92 ixer = Indexer() 92 93 93 container0 = ShelveContainer( '/tmp/cache0.p')94 container0 = ShelveContainer(os.path.join(tempfile.gettempdir(), 'cache0.p')) 94 95 ai = AuthorIndex('ai', container=container0) 95 96 ixer.register(ai) 96 97 97 container1 = ShelveContainer( '/tmp/cache1.p')98 container1 = ShelveContainer(os.path.join(tempfile.gettempdir(), 'cache1.p')) 98 99 pi = PublishedIndex('pi', container=container1, granularity=DateIndex.month) 99 100 ixer.register(pi) … … 114 115 self.assertEqual(ai.lookup('Jon Doe'), set()) 115 116 116 if os.path.exists( '/tmp/cache0.p'):117 os.unlink( '/tmp/cache0.p')118 119 if os.path.exists( '/tmp/cache1.p'):120 os.unlink( '/tmp/cache1.p')117 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache0.p')): 118 os.unlink(os.path.join(tempfile.gettempdir(), 'cache0.p')) 119 120 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache1.p')): 121 os.unlink(os.path.join(tempfile.gettempdir(), 'cache1.p')) 121 122 122 123 ixer.shutdown() … … 125 126 ixer = Indexer() 126 127 127 container0 = ShelveContainer( '/tmp/cache0.p')128 container0 = ShelveContainer(os.path.join(tempfile.gettempdir(), 'cache0.p')) 128 129 ai = AuthorIndex('ai', container=container0) 129 130 ixer.register(ai) 130 131 131 container1 = ShelveContainer( '/tmp/cache1.p')132 container1 = ShelveContainer(os.path.join(tempfile.gettempdir(), 'cache1.p')) 132 133 pi = PublishedIndex('pi', container=container1, granularity=DateIndex.month) 133 134 ixer.register(pi) … … 161 162 ('test_col', 'test_mb')])) 162 163 163 if os.path.exists( '/tmp/cache0.p'):164 os.unlink( '/tmp/cache0.p')165 166 if os.path.exists( '/tmp/cache1.p'):167 os.unlink( '/tmp/cache1.p')164 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache0.p')): 165 os.unlink(os.path.join(tempfile.gettempdir(), 'cache0.p')) 166 167 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache1.p')): 168 os.unlink(os.path.join(tempfile.gettempdir(), 'cache1.p')) 168 169 169 170 ixer.shutdown() … … 172 173 ixer = Indexer() 173 174 174 container = ShelveContainer( '/tmp/cache0.p')175 container = ShelveContainer(os.path.join(tempfile.gettempdir(), 'cache0.p')) 175 176 ki = KeywordIndex('ki', container=container, keywords=['really', 'stupid', 'not']) 176 177 ixer.register(ki) … … 185 186 self.assertEqual(ki.contains('hello'), set()) 186 187 187 if os.path.exists( '/tmp/cache0.p'):188 os.unlink( '/tmp/cache0.p')188 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache0.p')): 189 os.unlink(os.path.join(tempfile.gettempdir(), 'cache0.p')) 189 190 190 191 ixer.shutdown() 191 192 192 193 if __name__ == '__main__': 193 if os.path.exists( '/tmp/cache0.p'):194 os.unlink( '/tmp/cache0.p')195 196 if os.path.exists( '/tmp/cache1.p'):197 os.unlink( '/tmp/cache1.p')194 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache0.p')): 195 os.unlink(os.path.join(tempfile.gettempdir(), 'cache0.p')) 196 197 if os.path.exists(os.path.join(tempfile.gettempdir(), 'cache1.p')): 198 os.unlink(os.path.join(tempfile.gettempdir(), 'cache1.p')) 198 199 199 200 import unittest oss/amplee/amplee/test/test_path.py
r533 r764 1 1 # -*- coding: utf-8 -*- 2 import sys 2 3 import os.path 3 4 from amplee.utils import safe_path_join as spj … … 7 8 class TestPath(unittest.TestCase): 8 9 def test_os_path_join(self): 9 self.assertEqual(os.path.join('test', 'me'), 'test/me') 10 11 p = os.path.join(u'test', 'me') 12 self.assertEqual(p, 'test/me') 13 self.assertEqual(isinstance(p, unicode), True) 14 15 p = os.path.join(u'test\xe9', 'me') 16 self.assertEqual(p, u'test\xe9/me') 17 self.assertEqual(isinstance(p, unicode), True) 10 if sys.platform == 'win32': 11 self.assertEqual(os.path.join('test', 'me'), 'test\\me') 12 13 p = os.path.join(u'test', 'me') 14 self.assertEqual(p, 'test\\me') 15 self.assertEqual(isinstance(p, unicode), True) 16 17 p = os.path.join(u'test\xe9', 'me') 18 self.assertEqual(p, u'test\xe9\\me') 19 self.assertEqual(isinstance(p, unicode), True) 20 else: 21 self.assertEqual(os.path.join('test', 'me'), 'test/me') 22 23 p = os.path.join(u'test', 'me') 24 self.assertEqual(p, 'test/me') 25 self.assertEqual(isinstance(p, unicode), True) 26 27 p = os.path.join(u'test\xe9', 'me') 28 self.assertEqual(p, u'test\xe9/me') 29 self.assertEqual(isinstance(p, unicode), True) 18 30 19 31 # This doesn't work by default because internally … … 22 34 23 35 def test_amplee_safe_path_join(self): 24 self.assertEqual(os.path.join('test', 'me'), 'test/me') 25 26 p = spj(u'test', 'me') 27 self.assertEqual(p, u'test/me') 28 self.assertEqual(isinstance(p, unicode), False) 29 30 p = spj(u'test\xe9', 'me') 31 self.assertEqual(p, 'test\xc3\xa9/me') 32 self.assertEqual(isinstance(p, unicode), False) 36 if sys.platform == 'win32': 37 self.assertEqual(os.path.join('test', 'me'), 'test\\me') 38 39 p = spj(u'test', 'me') 40 self.assertEqual(p, u'test\\me') 41 self.assertEqual(isinstance(p, unicode), False) 42 43 p = spj(u'test\xe9', 'me') 44 self.assertEqual(p, 'test\xc3\xa9\\me') 45 self.assertEqual(isinstance(p, unicode), False) 33 46 34 p = spj(u'test', 'me\xc3\xa9') 35 self.assertEqual(p, 'test/me\xc3\xa9') 36 self.assertEqual(isinstance(p, unicode), False) 47 p = spj(u'test', 'me\xc3\xa9') 48 self.assertEqual(p, 'test\\me\xc3\xa9') 49 self.assertEqual(isinstance(p, unicode), False) 50 else: 51 self.assertEqual(os.path.join('test', 'me'), 'test/me') 52 53 p = spj(u'test', 'me') 54 self.assertEqual(p, u'test/me') 55 self.assertEqual(isinstance(p, unicode), False) 56 57 p = spj(u'test\xe9', 'me') 58 self.assertEqual(p, 'test\xc3\xa9/me') 59 self.assertEqual(isinstance(p, unicode), False) 60 61 p = spj(u'test', 'me\xc3\xa9') 62 self.assertEqual(p, 'test/me\xc3\xa9') 63 self.assertEqual(isinstance(p, unicode), False) 37 64 38 65 if __name__ == '__main__': oss/amplee/amplee/test/test_storage_fs.py
r615 r764 37 37 name = 'test%d' % index 38 38 fs.create_container(name) 39 self.assertEqual(os.path.exists( os.path.join(repo_dir, name)), True)39 self.assertEqual(os.path.exists(safe_path_join(repo_dir, name)), True) 40 40 41 41 def test_03_add_container_with_unicode_name(self): … … 43 43 name = 'test \xc3\xa9'.decode('utf-8') 44 44 fs.create_container(name) 45 self.assertEqual(os.path.exists( os.path.join(repo_dir, name)), True)45 self.assertEqual(os.path.exists(safe_path_join(repo_dir, name)), True) 46 46 47 47 def test_04_put_content(self): oss/amplee/amplee/test/test_storage_svn.py
r615 r764 1 1 # -*- coding: utf-8 -*- 2 import sys 2 3 import os, os.path 3 4 import unittest … … 7 8 from amplee.error import UnknownResource 8 9 9 repo_dir = 'file://%s' % os.path.join(os.getcwd(), 'tmp', 'svnrepo') 10 if sys.platform == 'win32': 11 path = os.path.splitdrive(os.path.realpath(os.path.join(os.getcwd(), 'tmp', 'svnrepo')))[1] 12 path = path.replace('\\', '/') 13 else: 14 path = os.path.join(os.getcwd(), 'tmp', 'svnrepo') 15 repo_dir = 'file://%s' % path 10 16 working_copy_path = os.path.join(os.getcwd(), 'tmp', 'svnrepocopy') 11 17
