From 6569690f2ef77dcd3fe33b555598fd240a7d79fa Mon Sep 17 00:00:00 2001
From: Alberto Miranda <alberto.miranda@bsc.es>
Date: Thu, 10 Dec 2020 22:22:18 +0100
Subject: [PATCH] Replace os.popen(sfind, ...) with gkfs_shell.sfind(...) in
test_extended
---
tests/integration/directories/test_directories.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/tests/integration/directories/test_directories.py b/tests/integration/directories/test_directories.py
index c83789f13..592fbee8c 100644
--- a/tests/integration/directories/test_directories.py
+++ b/tests/integration/directories/test_directories.py
@@ -220,11 +220,16 @@ def test_extended(gkfs_daemon, gkfs_shell, gkfs_client):
ret = gkfs_client.write(file_a, buf, 1)
assert ret.retval == 1
- preload = 'LIBGKFS_HOSTS_FILE='+str(gkfs_client._patched_env['LIBGKFS_HOSTS_FILE'])+' LD_PRELOAD='+str(gkfs_client._preload_library)
- stream = os.popen(preload+' '+str(gkfs_daemon._workspace.bindirs[1])+'/sfind '+str(topdir)+' -M '+str(gkfs_daemon.mountdir)+' -S 1 -name "*_k*"');
- output = stream.read()
- assert output == "MATCHED 0/4\n"
-
+
+ cmd = gkfs_shell.sfind(
+ topdir,
+ f'-M {gkfs_daemon.mountdir}',
+ '-S 1',
+ '-name "*_k*"'
+ )
+
+ assert cmd.exit_code == 0
+ assert cmd.stdout.decode() == "MATCHED 0/4\n"
@pytest.mark.skip(reason="invalid errno returned on success")
@pytest.mark.parametrize("directory_path",
--
GitLab