U1DB

Merge lp:~jameinel/u1db/win32-delete-db into lp:u1db

  1. win32-delete-db
  2. Merge into trunk
Proposed by John A Meinel
Status: Merged
Merged at revision: 290
Proposed branch: lp:~jameinel/u1db/win32-delete-db
Merge into: lp:u1db
Diff against target: 23 lines (+2/-0)
2 files modified
u1db/tests/test_server_state.py (+1/-0)
u1db/tests/test_sqlite_backend.py (+1/-0)
To merge this branch: bzr merge lp:~jameinel/u1db/win32-delete-db
Reviewer Review Type Date Requested Status
John O'Brien (community) Approve
Review via email: mp+105960@code.launchpad.net

Description of the change

This just gets the test suite passing again on Windows. The delete_database tests just need to close a file if they are going to delete it.

To post a comment you must log in.
Revision history for this message
John O'Brien (jdobrien) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'u1db/tests/test_server_state.py'
2--- u1db/tests/test_server_state.py 2012-05-15 10:39:10 +0000
3+++ u1db/tests/test_server_state.py 2012-05-16 12:06:18 +0000
4@@ -81,6 +81,7 @@
5 self.state.set_workingdir(tempdir)
6 path = tempdir + '/test.db'
7 db = self.state.ensure_database('test.db')
8+ db.close()
9 self.state.delete_database('test.db')
10 self.assertFalse(os.path.exists(path))
11
12
13=== modified file 'u1db/tests/test_sqlite_backend.py'
14--- u1db/tests/test_sqlite_backend.py 2012-05-15 11:11:06 +0000
15+++ u1db/tests/test_sqlite_backend.py 2012-05-16 12:06:18 +0000
16@@ -323,6 +323,7 @@
17 temp_dir = self.createTempDir(prefix='u1db-test-')
18 path = temp_dir + '/new.sqlite'
19 db = sqlite_backend.SQLiteDatabase.open_database(path, create=True)
20+ db.close()
21 sqlite_backend.SQLiteDatabase.delete_database(path)
22 self.assertRaises(errors.DatabaseDoesNotExist,
23 sqlite_backend.SQLiteDatabase.open_database, path,

Subscribers

People subscribed via source and target branches