Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix unit tests

Browse Source
This commit is contained in:
Henry Oswald
2018-08-23 00:12:05 +01:00
parent 05ddbd3a18
commit 5074442702
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/coffee/LockManager.coffee
View File

@@ -15,16 +15,17 @@ module.exports = LockManager =
pollPeriod: @LOCK_TEST_INTERVAL pollPeriod: @LOCK_TEST_INTERVAL
stale: @LOCK_STALE stale: @LOCK_STALE
Lockfile.lock path, lockOpts, (error) -> Lockfile.lock path, lockOpts, (error) ->
return callback new Errors.AlreadyCompilingError("compile in progress") if error?.code is 'EEXIST' if error?.code is 'EEXIST'
if error? return callback new Errors.AlreadyCompilingError("compile in progress")
fs.lstat path, (statLockErr, statLock)-> else if error?
fs.lstat Path.dirname(path), (statDirErr, statDir)-> fs.lstat path, (statLockErr, statLock)->
fs.readdir Path.dirname(path), (readdirErr, readdirDir)-> fs.lstat Path.dirname(path), (statDirErr, statDir)->
fs.readdir Path.dirname(path), (readdirErr, readdirDir)->
logger.err error:error, path:path, statLock:statLock, statLockErr:statLockErr, statDir:statDir, statDirErr: statDirErr, readdirErr:readdirErr, readdirDir:readdirDir, "unable to get lock" logger.err error:error, path:path, statLock:statLock, statLockErr:statLockErr, statDir:statDir, statDirErr: statDirErr, readdirErr:readdirErr, readdirDir:readdirDir, "unable to get lock"
return callback(error) return callback(error)
else else
runner (error1, args...) -> runner (error1, args...) ->
Lockfile.unlock path, (error2) -> Lockfile.unlock path, (error2) ->
error = error1 or error2 error = error1 or error2
return callback(error) if error? return callback(error) if error?
callback(null, args...) callback(null, args...)

3
test/unit/coffee/LockManagerTests.coffee
View File

@@ -9,9 +9,10 @@ describe "DockerLockManager", ->
beforeEach -> beforeEach ->
@LockManager = SandboxedModule.require modulePath, requires: @LockManager = SandboxedModule.require modulePath, requires:
"settings-sharelatex": {} "settings-sharelatex": {}
"logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub() } "logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub(), err:-> }
"fs": "fs":
lstat:sinon.stub().callsArgWith(1) lstat:sinon.stub().callsArgWith(1)
readdir: sinon.stub().callsArgWith(1)
"lockfile": @Lockfile = {} "lockfile": @Lockfile = {}
@lockFile = "/local/compile/directory/.project-lock" @lockFile = "/local/compile/directory/.project-lock"