From 40c796300cdc7119f3838768e268dadfe845172b Mon Sep 17 00:00:00 2001 From: Chandrika Srinivasan Date: Wed, 8 Jun 2016 13:35:04 +0100 Subject: [PATCH] CA-212813: Fix NFS attach unit test Changed unit test to reflect changes made for CA-207783 (PR 305) Signed-off-by: Chandrika Srinivasan Reviewed-by: Mark Syms GitHub: closes xapi-project/sm#316 --- tests/test_NFSSR.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/test_NFSSR.py b/tests/test_NFSSR.py index ad71803b6..4a8806603 100644 --- a/tests/test_NFSSR.py +++ b/tests/test_NFSSR.py @@ -18,7 +18,7 @@ def __init__(self, srcmd, none): class TestNFSSR(unittest.TestCase): def create_nfssr(self, server='aServer', serverpath='/aServerpath', - sr_uuid='asr_uuid', nfsversion=None): + sr_uuid='asr_uuid', nfsversion=None, useroptions=''): srcmd = mock.Mock() srcmd.dconf = { 'server': server, @@ -26,6 +26,8 @@ def create_nfssr(self, server='aServer', serverpath='/aServerpath', } if nfsversion: srcmd.dconf.update({'nfsversion': nfsversion}) + if useroptions: + srcmd.dconf.update({'options': useroptions}) srcmd.params = { 'command': 'some_command', 'device_config': {} @@ -72,7 +74,7 @@ def test_attach(self, validate_nfsversion, check_server_tcp, _testhost, soft_mount, Lock, makedirs): validate_nfsversion.return_value = "aNfsversionChanged" nfssr = self.create_nfssr(server='aServer', serverpath='/aServerpath', - sr_uuid='UUID') + sr_uuid='UUID', useroptions='options') nfssr.attach(None) @@ -82,5 +84,6 @@ def test_attach(self, validate_nfsversion, check_server_tcp, _testhost, 'aServer', '/aServerpath/UUID', 'tcp', + useroptions='options', timeout=0, nfsversion='aNfsversionChanged')