Skip to content

Commit f0f0ada

Browse files
committed
test: assertions on db path use #realdirpath
sqlite 3.39.0 starts resolving symlinks to return a canonical path, so our tests must do the same.
1 parent 3c707d3 commit f0f0ada

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

test/test_database.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_db_filename
2020
assert_equal '', @db.filename('main')
2121
tf = Tempfile.new 'thing'
2222
@db = SQLite3::Database.new tf.path
23-
assert_equal File.expand_path(tf.path), File.expand_path(@db.filename('main'))
23+
assert_equal File.realdirpath(tf.path), File.realdirpath(@db.filename('main'))
2424
ensure
2525
tf.unlink if tf
2626
end
@@ -30,7 +30,7 @@ def test_filename
3030
assert_equal '', @db.filename
3131
tf = Tempfile.new 'thing'
3232
@db = SQLite3::Database.new tf.path
33-
assert_equal File.expand_path(tf.path), File.expand_path(@db.filename)
33+
assert_equal File.realdirpath(tf.path), File.realdirpath(@db.filename)
3434
ensure
3535
tf.unlink if tf
3636
end
@@ -40,7 +40,8 @@ def test_filename_with_attachment
4040
assert_equal '', @db.filename
4141
tf = Tempfile.new 'thing'
4242
@db.execute "ATTACH DATABASE '#{tf.path}' AS 'testing'"
43-
assert_equal File.expand_path(tf.path), File.expand_path(@db.filename('testing'))
43+
44+
assert_equal File.realdirpath(tf.path), File.realdirpath(@db.filename('testing'))
4445
ensure
4546
tf.unlink if tf
4647
end
@@ -50,7 +51,7 @@ def test_filename_to_path
5051
tf = Tempfile.new 'thing'
5152
pn = Pathname tf.path
5253
db = SQLite3::Database.new pn
53-
assert_equal pn.expand_path.to_s, File.expand_path(db.filename)
54+
assert_equal pn.realdirpath.to_s, File.realdirpath(db.filename)
5455
ensure
5556
tf.close! if tf
5657
end

0 commit comments

Comments
 (0)