Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix test failures due to file locking on windows

Browse Source
This commit is contained in:
Kovid Goyal 2013-08-06 12:31:47 +05:30
parent 37484fb02c
commit 17dcc39aff
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/calibre/db/tests/legacy.py
View File

@ -10,7 +10,6 @@ import inspect, time
from io import BytesIO from io import BytesIO
from repr import repr from repr import repr
from functools import partial from functools import partial
from tempfile import NamedTemporaryFile
from operator import itemgetter from operator import itemgetter
from calibre.db.tests.base import BaseTest from calibre.db.tests.base import BaseTest
@ -313,19 +312,20 @@ class LegacyTest(BaseTest):
def test_legacy_adding_books(self): # {{{ def test_legacy_adding_books(self): # {{{
'Test various adding/deleting books methods' 'Test various adding/deleting books methods'
from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.book.base import Metadata
from calibre.ptempfile import TemporaryFile
legacy, old = self.init_legacy(self.cloned_library), self.init_old(self.cloned_library) legacy, old = self.init_legacy(self.cloned_library), self.init_old(self.cloned_library)
mi = Metadata('Added Book0', authors=('Added Author',)) mi = Metadata('Added Book0', authors=('Added Author',))
with NamedTemporaryFile(suffix='.aff') as f: with TemporaryFile(suffix='.aff') as name:
f.write(b'xxx') with open(name, 'wb') as f:
f.flush() f.write(b'xxx')
T = partial(ET, 'add_books', ([f.name], ['AFF'], [mi]), old=old, legacy=legacy) T = partial(ET, 'add_books', ([name], ['AFF'], [mi]), old=old, legacy=legacy)
T()(self) T()(self)
book_id = T(kwargs={'return_ids':True})(self)[1][0] book_id = T(kwargs={'return_ids':True})(self)[1][0]
self.assertEqual(legacy.new_api.formats(book_id), ('AFF',)) self.assertEqual(legacy.new_api.formats(book_id), ('AFF',))
T(kwargs={'add_duplicates':False})(self) T(kwargs={'add_duplicates':False})(self)
mi.title = 'Added Book1' mi.title = 'Added Book1'
mi.uuid = 'uuu' mi.uuid = 'uuu'
T = partial(ET, 'import_book', (mi,[f.name]), old=old, legacy=legacy) T = partial(ET, 'import_book', (mi,[name]), old=old, legacy=legacy)
book_id = T()(self) book_id = T()(self)
self.assertNotEqual(legacy.uuid(book_id, index_is_id=True), old.uuid(book_id, index_is_id=True)) self.assertNotEqual(legacy.uuid(book_id, index_is_id=True), old.uuid(book_id, index_is_id=True))
book_id = T(kwargs={'preserve_uuid':True})(self) book_id = T(kwargs={'preserve_uuid':True})(self)
@ -336,10 +336,10 @@ class LegacyTest(BaseTest):
T((0, 'AFF', BytesIO(b'fffff')))(self) T((0, 'AFF', BytesIO(b'fffff')))(self)
T((0, 'AFF', BytesIO(b'fffff')))(self) T((0, 'AFF', BytesIO(b'fffff')))(self)
T((0, 'AFF', BytesIO(b'fffff')), {'replace':True})(self) T((0, 'AFF', BytesIO(b'fffff')), {'replace':True})(self)
with NamedTemporaryFile(suffix='.opf') as f: with TemporaryFile(suffix='.opf') as name:
f.write(b'zzzz') with open(name, 'wb') as f:
f.flush() f.write(b'zzzz')
T = partial(ET, 'import_book', (mi,[f.name]), old=old, legacy=legacy) T = partial(ET, 'import_book', (mi,[name]), old=old, legacy=legacy)
book_id = T()(self) book_id = T()(self)
self.assertFalse(legacy.new_api.formats(book_id)) self.assertFalse(legacy.new_api.formats(book_id))
@ -349,21 +349,21 @@ class LegacyTest(BaseTest):
T({'add_duplicates':False}) T({'add_duplicates':False})
T({'force_id':1000}) T({'force_id':1000})
with NamedTemporaryFile(suffix='.txt') as f: with TemporaryFile(suffix='.txt') as name:
f.write(b'tttttt') with open(name, 'wb') as f:
f.seek(0) f.write(b'tttttt')
bid = legacy.add_catalog(f.name, 'My Catalog') bid = legacy.add_catalog(name, 'My Catalog')
self.assertEqual(old.add_catalog(f.name, 'My Catalog'), bid) self.assertEqual(old.add_catalog(name, 'My Catalog'), bid)
cache = legacy.new_api cache = legacy.new_api
self.assertEqual(cache.formats(bid), ('TXT',)) self.assertEqual(cache.formats(bid), ('TXT',))
self.assertEqual(cache.field_for('title', bid), 'My Catalog') self.assertEqual(cache.field_for('title', bid), 'My Catalog')
self.assertEqual(cache.field_for('authors', bid), ('calibre',)) self.assertEqual(cache.field_for('authors', bid), ('calibre',))
self.assertEqual(cache.field_for('tags', bid), (_('Catalog'),)) self.assertEqual(cache.field_for('tags', bid), (_('Catalog'),))
self.assertTrue(bid < legacy.add_catalog(f.name, 'Something else')) self.assertTrue(bid < legacy.add_catalog(name, 'Something else'))
self.assertEqual(legacy.add_catalog(f.name, 'My Catalog'), bid) self.assertEqual(legacy.add_catalog(name, 'My Catalog'), bid)
self.assertEqual(old.add_catalog(f.name, 'My Catalog'), bid) self.assertEqual(old.add_catalog(name, 'My Catalog'), bid)
bid = legacy.add_news(f.name, {'title':'Events', 'add_title_tag':True, 'custom_tags':('one', 'two')}) bid = legacy.add_news(name, {'title':'Events', 'add_title_tag':True, 'custom_tags':('one', 'two')})
self.assertEqual(cache.formats(bid), ('TXT',)) self.assertEqual(cache.formats(bid), ('TXT',))
self.assertEqual(cache.field_for('authors', bid), ('calibre',)) self.assertEqual(cache.field_for('authors', bid), ('calibre',))
self.assertEqual(cache.field_for('tags', bid), (_('News'), 'Events', 'one', 'two')) self.assertEqual(cache.field_for('tags', bid), (_('News'), 'Events', 'one', 'two'))
@ -783,5 +783,6 @@ class LegacyTest(BaseTest):
('saved_search_names',), ('saved_search_names',),
('saved_search_lookup', 'n'), ('saved_search_lookup', 'n'),
)) ))
db.close()
# }}} # }}}