1 files changed, 3 insertions, 15 deletions
diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb
index 81d1935132..038473ccdc 100644
--- a/activejob/test/support/integration/adapters/queue_classic.rb
+++ b/activejob/test/support/integration/adapters/queue_classic.rb
@@ -1,12 +1,12 @@
 module QueueClassicJobsManager
   def setup
-    ENV['QC_DATABASE_URL'] ||= 'postgres://localhost/active_jobs_qc_int_test'
+    ENV['QC_DATABASE_URL'] ||= 'postgres:///active_jobs_qc_int_test'
     ENV['QC_LISTEN_TIME']    = "0.5"
     uri = URI.parse(ENV['QC_DATABASE_URL'])
     user = uri.user||ENV['USER']
     pass = uri.password
     db   = uri.path[1..-1]
-    %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'drop database "#{db}"' -U #{user} -t template1}
+    %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'drop database if exists "#{db}"' -U #{user} -t template1}
     %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'create database "#{db}"' -U #{user} -t template1}
     ActiveJob::Base.queue_adapter = :queue_classic
     QC::Setup.create
@@ -17,23 +17,11 @@ module QueueClassicJobsManager
 
   def clear_jobs
     QC::Queue.new("integration_tests").delete_all
-    retried = false
-  rescue => e
-    puts "Got exception while trying to clear jobs: #{e.inspect}"
-    if retried
-      puts "Already retried. Raising exception"
-      raise e
-    else
-      puts "Retrying"
-      retried = true
-      QC::Conn.connection = QC::Conn.connect
-      retry
-    end
   end
 
   def start_workers
+    QC::Conn.disconnect
     @pid = fork do
-      QC::Conn.connection = QC::Conn.connect
       worker = QC::Worker.new(q_name: 'integration_tests')
       worker.start
     end