Use Path.home() instead of ~

Change-Id: I5863f4e0315b67a07dab4756857dba7aa37932f0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 7bf2e7a..39925f4 100644 (file)
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -16,6 +16,7 @@ from __future__ import division
 
 import logging
 import os
+from pathlib import Path
 import re
 import subprocess
 import time
@@ -30,7 +31,7 @@ class E2ETesting(testcase.TestCase):
 
     __logger = logging.getLogger(__name__)
 
-    config = '~/.kube/config'
+    config = f'{Path.home()}/.kube/config'
     gcr_repo = os.getenv("MIRROR_REPO", "gcr.io")
     k8s_gcr_repo = os.getenv("MIRROR_REPO", "k8s.gcr.io")
 

diff --git a/functest_kubernetes/netperf/netperf.py b/functest_kubernetes/netperf/netperf.py
index 3178817..b0cd8e4 100644 (file)
--- a/functest_kubernetes/netperf/netperf.py
+++ b/functest_kubernetes/netperf/netperf.py
@@ -14,6 +14,7 @@ Benchmarking Kubernetes Networking Performance
 import glob
 import logging
 import os
+from pathlib import Path
 import shutil
 import subprocess
 import time
@@ -44,7 +45,7 @@ class Netperf(testcase.TestCase):
             if not os.path.exists(self.res_dir):
                 os.makedirs(self.res_dir)
             cmd = ['launch', '-iterations', '1', '-kubeConfig',
-                   '~/.kube/config']
+                   f'{Path.home()}/.kube/config']
             output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
             self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
             lfiles = glob.glob(os.path.join(