unit tests fix
This commit is contained in:
parent
98bc615839
commit
0f23ea0dda
@ -454,6 +454,7 @@ module RedmineDmsf
|
|||||||
def lock(args)
|
def lock(args)
|
||||||
if parent.nil? || ((parent.projectless_path != '/') && (!parent.exist?))
|
if parent.nil? || ((parent.projectless_path != '/') && (!parent.exist?))
|
||||||
e = DAV4Rack::LockFailure.new
|
e = DAV4Rack::LockFailure.new
|
||||||
|
puts ">>> Conflict 1 #{parent.nil?} #{parent.projectless_path} #{parent.exist?}"
|
||||||
e.add_failure @path, Conflict
|
e.add_failure @path, Conflict
|
||||||
raise e
|
raise e
|
||||||
end
|
end
|
||||||
@ -482,6 +483,7 @@ module RedmineDmsf
|
|||||||
if http_if.blank?
|
if http_if.blank?
|
||||||
e = DAV4Rack::LockFailure.new
|
e = DAV4Rack::LockFailure.new
|
||||||
e.add_failure @path, Conflict
|
e.add_failure @path, Conflict
|
||||||
|
puts ">>> Conflict 2 #{http_if}"
|
||||||
raise e
|
raise e
|
||||||
end
|
end
|
||||||
l = nil
|
l = nil
|
||||||
@ -491,6 +493,7 @@ module RedmineDmsf
|
|||||||
unless l
|
unless l
|
||||||
e = DAV4Rack::LockFailure.new
|
e = DAV4Rack::LockFailure.new
|
||||||
e.add_failure @path, Conflict
|
e.add_failure @path, Conflict
|
||||||
|
puts ">>> Conflict 3 #{$1}"
|
||||||
raise e
|
raise e
|
||||||
end
|
end
|
||||||
l.expires_at = Time.current + 1.week
|
l.expires_at = Time.current + 1.week
|
||||||
@ -510,6 +513,7 @@ module RedmineDmsf
|
|||||||
rescue DmsfLockError
|
rescue DmsfLockError
|
||||||
e = DAV4Rack::LockFailure.new
|
e = DAV4Rack::LockFailure.new
|
||||||
e.add_failure @path, Conflict
|
e.add_failure @path, Conflict
|
||||||
|
puts ">>> Conflict 4 DmsfLockError #{@path}"
|
||||||
raise e
|
raise e
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user