Merge dc1be88 into 16e41d9

.travis.yml

@@ -13,7 +13,7 @@ before_install:
   - sudo chmod 0777 /var/run
 
 install:
-  - pip install "coverage>=3.6" "nose>=1.3.0" "flake8>=2.1" "coveralls>=0.3"
+  - pip install "coverage>=3.6" "nose>=1.3.0" "flake8>=2.1" "coveralls>=0.3" "mock>=2.0.0"
   - pip install -e .
 
 script:

pid/__init__.py

@@ -164,10 +164,9 @@ def create(self):
             try:
                 fcntl.flock(self.fh.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
             except IOError as exc:
-                self.close(cleanup=False)
-                if self.allow_samepid:
-                    return
-                raise PidFileAlreadyLockedError(exc)
+                if not self.allow_samepid:
+                    self.close(cleanup=False)
+                    raise PidFileAlreadyLockedError(exc)
 
         check_result = self.check()
         if check_result == PID_CHECK_SAMEPID:

tests/test_pid.py

@@ -2,6 +2,7 @@
 import os.path
 import signal
 from contextlib import contextmanager
+from mock import patch
 
 import pid
 
@@ -265,6 +266,23 @@ def test_pid_check_samepid():
         pidfile.close()
 
 
+def test_pid_check_samepid_two_processes():
+    pidfile_proc1 = pid.PidFile()
+    pidfile_proc2 = pid.PidFile(allow_samepid=True)
+
+    try:
+        with patch('pid.os.getpid') as mgetpid:
+            mgetpid.return_value = 1
+            pidfile_proc1.create()
+
+            mgetpid.return_value = 2
+            with raising(pid.PidFileAlreadyRunningError, pid.PidFileAlreadyLockedError):
+                pidfile_proc2.create()
+    finally:
+        pidfile_proc1.close()
+        pidfile_proc2.close()
+
+
 def test_pid_default_term_signal():
     signal.signal(signal.SIGTERM, signal.SIG_DFL)