github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-17 07:42:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FIX: parallel spec system needs needs a dedicated upload folder for each worker. (#8372)"

Browse Source 
This reverts commit 42e5176bc3.
This commit is contained in:
Vinoth Kannan 2019-11-19 15:02:18 +05:30
parent 42e5176bc3
commit d3e7768ea8
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/file_store/base_store.rb
View File

@ -31,13 +31,7 @@ module FileStore
end end
def upload_path def upload_path
if ENV['RAILS_ENV'] != "test" || !ENV['TEST_ENV_NUMBER'] File.join("uploads", RailsMultisite::ConnectionManagement.current_db)
return File.join("uploads", RailsMultisite::ConnectionManagement.current_db)
end
# Parallel spec system
n = ENV['TEST_ENV_NUMBER'].presence || '1'
File.join("uploads", RailsMultisite::ConnectionManagement.current_db, n)
end end
def has_been_uploaded?(url) def has_been_uploaded?(url)