Skip to content

fix: use subprocess instead of os.system in locktests.py #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orbisai0security wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −12
Open

fix: use subprocess instead of os.system in locktests.py #1315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions testcases/network/nfsv4/locks/locktests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Report bugs to Vincent ROQUETA : vincent.roqueta@ext.bull.net

import encodings
_sp = __import__('subprocess')
import shutil
import os, sys
import getopt, sys
Expand Down Expand Up @@ -49,29 +50,27 @@ def __init__(self, machine):
self.mountPath=NFS4_PATH

def do(self):
self.command="ssh "+user+"@"+self.machine+" "+self.command
os.system(self.command)
_sp.run(["ssh", user+"@"+self.machine, self.command])

def isomount(self, dir):
export=NFS4_SERVER
mntpoint=NFS4_PATH
self.command="'mkdir -p "+mntpoint+"; mount -t nfs4 "+export+" "+mntpoint+"'"
self.command="mkdir -p "+mntpoint+"; mount -t nfs4 "+export+" "+mntpoint
self.do()

def umount(self, dir):
mntpoint=self.mountPath+"/"+dir
self.command="umount "+mntpoint
self.do()
def install(self, path):
self.command="'cd "+path+"; tar xzf "+SRC+"; cd locks; make'"
self.command="cd "+path+"; tar xzf "+SRC+"; cd locks; make"
self.do()

def run(self, appli):
self.command=appli
self.do()
def cp(self, fichier, path):
command="scp "+fichier+" "+user+"@"+self.machine+":"+path
os.system(command)
_sp.run(["scp", fichier, user+"@"+self.machine+":"+path])


class Serveur(Machine):
Expand All @@ -81,8 +80,7 @@ def __init__(self, ip, exportPath):
self.exportPath=exportPath

def do(self):
self.command="ssh "+self.SERVEUR+" "+self.command
os.system(self.command)
_sp.run(["ssh", self.SERVEUR, self.command])

def configure(self, dir):
exportDir=self.exportPath+'/'+dir
Expand Down Expand Up @@ -132,8 +130,9 @@ def setup():
c.isomount(NFS4_PATH)
#Setup localhost
print("Setting up localhost")
commande="make; mkdir -p "+NFS4_PATH+" ; mount -t nfs4 "+NFS4_SERVER+" "+NFS4_PATH+" &"
os.system(commande)
_sp.run(["make"])
_sp.run(["mkdir", "-p", NFS4_PATH])
_sp.run(["mount", "-t", "nfs4", NFS4_SERVER, NFS4_PATH])


def run():
Expand All @@ -142,8 +141,7 @@ def run():
hostname=socket.gethostname()
# Lancement du serveur en local
# Launch the server locally
commande=path+"/"+app+" -n "+nbreProcess+" -f "+filename+" -c "+str(nbreClients)+" &"
os.system(commande)
_sp.Popen([path+"/"+app, "-n", nbreProcess, "-f", filename, "-c", str(nbreClients)])
commande=path+"/locks/"+app+" --server "+hostname
for i in clients:
c=Client(i)
Expand Down