summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2020-07-20 13:04:07 +0200
committerChris Lamb <chris@chris-lamb.co.uk>2020-07-20 13:04:07 +0200
commit9c1a0647b51c12a830d847b2a37b9c8008264d9b (patch)
tree9d104f22b3c32c95ad1aa701e3134958798e8f87
parenta5208bbd68a108c9bbed6f20ab1e801a004b982f (diff)
downloadlogilab-common-9c1a0647b51c12a830d847b2a37b9c8008264d9b.tar.gz
Make the build reproducible
-rw-r--r--logilab/common/proc.py4
-rw-r--r--logilab/common/pytest.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/logilab/common/proc.py b/logilab/common/proc.py
index 2d2e78c..49d4d96 100644
--- a/logilab/common/proc.py
+++ b/logilab/common/proc.py
@@ -171,13 +171,13 @@ class MemorySentinel(Thread):
daemonic thread
"""
- def __init__(self, interval, memory_limit, gpid=os.getpid()):
+ def __init__(self, interval, memory_limit, gpid=None):
Thread.__init__(self, target=self._run, name="Test.Sentinel")
self.memory_limit = memory_limit
self._stop = Event()
self.interval = interval
self.setDaemon(True)
- self.gpid = gpid
+ self.gpid = gpid if gpid is not None else os.getpid()
def stop(self):
"""stop ap"""
diff --git a/logilab/common/pytest.py b/logilab/common/pytest.py
index b7f2e83..3b60ecf 100644
--- a/logilab/common/pytest.py
+++ b/logilab/common/pytest.py
@@ -209,8 +209,10 @@ def load_pytest_conf(path, parser):
return namespace.get("CustomPyTester", PyTester)
-def project_root(parser, projdir=os.getcwd()):
+def project_root(parser, projdir=None):
"""try to find project's root and add it to sys.path"""
+ if projdir is None:
+ projdir = os.getcwd()
previousdir = curdir = osp.abspath(projdir)
testercls = PyTester
conf_file_path = osp.join(curdir, CONF_FILE)