 
         override func main()
         {
-            let gotLock = lock.executeWithTimeout(ShortWaitTimeout) {
+            let gotLock = lock.execute(timeout: ShortWaitTimeout) {
                 XCTAssertTrue(false, "we weren't expecting to be able to grab this lock")
             }
 


            for _ in 0..<TestThreadIterations {
                if let timeout = lockTimeout {
                    let executed = lock.executeWithTimeout(timeout, fn)
                    XCTAssertTrue(executed)
                }
                else {

        {
            let fn = { () -> Void in
                // this also tests re-entrancy
                let gotLock = self.lock.execute(timeout: LongWaitTimeout) {
                    executions += 1

                    XCTAssertTrue(protect == 0)
