summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-12-18 16:12:23 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2019-12-18 16:12:23 +0100
commit04bcd8d9a16f0c053da916d8d57788f8851600a8 (patch)
tree1dcc6856886f01c75f5c0eacd8b7ee89b1ac2b2d
parent508ca736e93daf97473b3ec19f0e95bd6ff3945e (diff)
downloadpsutil-04bcd8d9a16f0c053da916d8d57788f8851600a8.tar.gz
HERE: use realpath() instead of abspath() because of failures seen in https://github.com/giampaolo/psutil/pull/1638#issuecomment-567013054
-rw-r--r--HISTORY.rst4
-rw-r--r--psutil/tests/__init__.py5
2 files changed, 7 insertions, 2 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 1135a2d4..8afc8f2e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,5 +1,9 @@
*Bug tracker at https://github.com/giampaolo/psutil/issues*
+5.6.8 (unreleased)
+==================
+
+XXXX-XX-XX
**Bug fixes**
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index 6c629368..767524af 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -153,9 +153,10 @@ ASCII_FS = sys.getfilesystemencoding().lower() in ('ascii', 'us-ascii')
# --- paths
-ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+ROOT_DIR = os.path.realpath(
+ os.path.join(os.path.dirname(__file__), '..', '..'))
SCRIPTS_DIR = os.path.join(ROOT_DIR, 'scripts')
-HERE = os.path.abspath(os.path.dirname(__file__))
+HERE = os.path.realpath(os.path.dirname(__file__))
# --- support