Skip to content

Commit

Permalink
Merge branch 'master' of github.com:developmentseed/node-sqlite3
Browse files Browse the repository at this point in the history
Conflicts:
	test/fts-content.test.js
	test/scheduling.test.js
  • Loading branch information
kkaefer committed Mar 19, 2013
2 parents ad32116 + 6e47b2d commit 113c371
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/scheduling.test.js
Expand Up @@ -5,7 +5,7 @@ describe('scheduling', function() {
it('scheduling after the database was closed', function(done) {
var db = new sqlite3.Database(':memory:');
db.on('error', function(err) {
assert.equal(err.message, "SQLITE_MISUSE: Database handle is closed");
assert.ok(err.message && err.message.indexOf("SQLITE_MISUSE: Database handle is closed") > -1);
done();
});

Expand All @@ -22,7 +22,7 @@ describe('scheduling', function() {

db.close();
db.run("CREATE TABLE foo (id int)", function(err) {
assert.ok(err.message, "SQLITE_MISUSE: Database handle is closed");
assert.ok(err.message && err.message.indexOf("SQLITE_MISUSE: Database handle is closed") > -1);
done();
});
});
Expand All @@ -34,7 +34,7 @@ describe('scheduling', function() {
if (err) throw err;
db.close(function(err) {
assert.ok(err);
assert.equal(err.message, "SQLITE_BUSY: unable to close due to unfinalised statements");
assert.ok(err.message && err.message.indexOf("SQLITE_BUSY: unable to close due to") > -1);

// Running a statement now should not fail.
stmt.run(done);
Expand Down

0 comments on commit 113c371

Please sign in to comment.