Fix flaky railties/test/applications/rake/dbs_test.rb

rails · Jan 11, 2023 · cdb21a1 · cdb21a1
1 parent d453eb5
commit cdb21a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
@@ -479,7 +479,7 @@ def db_schema_cache_dump
 
       test "db:schema:cache:dump dumps virtual columns" do
         Dir.chdir(app_path) do
-          use_postgresql(database_name: "railties_db")
+          use_postgresql
           rails "db:drop", "db:create"
 
           rails "runner", <<~RUBY
@@ -773,12 +773,12 @@ def db_fixtures_load(expected_database)
 
       test "db:prepare creates test database if it does not exist" do
         Dir.chdir(app_path) do
-          use_postgresql(database_name: "railties_db")
+          db_name = use_postgresql
           rails "db:drop", "db:create"
-          rails "runner", "ActiveRecord::Base.connection.drop_database(:railties_db_test)"
+          rails "runner", "ActiveRecord::Base.connection.drop_database(:#{db_name}_test)"
 
           output = rails("db:prepare")
-          assert_match(%r{Created database 'railties_db_test'}, output)
+          assert_match(%r{Created database '#{db_name}_test'}, output)
         end
       ensure
         rails "db:drop" rescue nil

diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
@@ -465,7 +465,8 @@ def use_frameworks(arr)
       $:.reject! { |path| path =~ %r'/(#{to_remove.join('|')})/' }
     end
 
-    def use_postgresql(multi_db: false, database_name: "railties_#{Process.pid}")
+    def use_postgresql(multi_db: false)
+      database_name = "railties_#{Process.pid}"
       if multi_db
         File.open("#{app_path}/config/database.yml", "w") do |f|
           f.puts <<-YAML
@@ -497,6 +498,7 @@ def use_postgresql(multi_db: false, database_name: "railties_#{Process.pid}")
           YAML
         end
       end
+      database_name
     end
   end