There are many sessions left after testing, they hold drc memory at server.
This patch tries to clean session after each testcase.
v2,
adds empty function of clean_sessions for nfs4.0,
because they are using the same testmod.py
Signed-off-by: Kinglong Mee <kinglongmee@xxxxxxxxx>
---
nfs4.0/servertests/environment.py | 3 +++
nfs4.1/server41tests/environment.py | 7 ++++++-
nfs4.1/testmod.py | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/nfs4.0/servertests/environment.py b/nfs4.0/servertests/environment.py
index 993320d..9852178 100644
--- a/nfs4.0/servertests/environment.py
+++ b/nfs4.0/servertests/environment.py
@@ -226,6 +226,9 @@ class Environment(testmod.Environment):
cmd += ' ' + args
os.system(cmd);
+ def clean_sessions(self):
+ return
+
#########################################
debug_fail = False
diff --git a/nfs4.1/server41tests/environment.py b/nfs4.1/server41tests/environment.py
index b2df732..7632655 100644
--- a/nfs4.1/server41tests/environment.py
+++ b/nfs4.1/server41tests/environment.py
@@ -248,7 +248,12 @@ class Environment(testmod.Environment):
def testname(self, t):
"""Returns a name for the test that is unique between runs"""
return "%s_%i" % (t.code, self.timestamp)
-
+
+ def clean_sessions(self):
+ """Destroy client name env.c1"""
+ for sessionid in self.c1.sessions.keys():
+ self.c1.compound([op.destroy_session(sessionid)])
+
#########################################
debug_fail = False
diff --git a/nfs4.1/testmod.py b/nfs4.1/testmod.py
index 5908066..661aed0 100644
--- a/nfs4.1/testmod.py
+++ b/nfs4.1/testmod.py
@@ -220,6 +220,7 @@ class Test(object):
environment.startUp()
self.runtest(self, environment)
self.result = self._pass_result
+ environment.clean_sessions()
except KeyboardInterrupt:
raise
except TestException, e:
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
