CA-387770 increase NFSSR and SMBSR test coverage

Signed-off-by: Robin Newton <robin.newton@cloud.com>

tests/test_NFSSR.py

@@ -134,6 +134,78 @@ def test_attach(self, validate_nfsversion, check_server_tcp, _testhost,
                                            nfsversion='aNfsversionChanged',
                                            retrans=4)
 
+    @mock.patch('util.makedirs', autospec=True)
+    @mock.patch('NFSSR.Lock', autospec=True)
+    @mock.patch('nfs.soft_mount', autospec=True)
+    @mock.patch('nfs.unmount', autospec=True)
+    @mock.patch('util._testHost', autospec=True)
+    @mock.patch('nfs.check_server_tcp', autospec=True)
+    @mock.patch('nfs.validate_nfsversion', autospec=True)
+    def test_attach_failure(self, validate_nfsversion, check_server_tcp,
+                            _testhost, unmount, soft_mount, Lock, makedirs):
+        soft_mount.side_effect = SR.SRException("aFailure")
+
+        nfssr = self.create_nfssr()
+
+        with self.assertRaises(SR.SRException):
+            nfssr.attach(None)
+
+        unmount.assert_not_called()
+
+    @mock.patch('FileSR.SharedFileSR._checkmount', autospec=True)
+    @mock.patch('util.makedirs', autospec=True)
+    @mock.patch('NFSSR.Lock', autospec=True)
+    @mock.patch('nfs.soft_mount', autospec=True)
+    def test_attach_already_mounted(self, soft_mount, Lock, makedirs,
+                                    mock_checkmount):
+        mock_checkmount.return_value = True
+
+        nfssr = self.create_nfssr()
+
+        nfssr.attach(None)
+
+        soft_mount.assert_not_called()
+
+    @mock.patch('FileSR.SharedFileSR._checkmount', autospec=True)
+    @mock.patch('FileSR.SharedFileSR._check_writable', autospec=True)
+    @mock.patch('FileSR.SharedFileSR._check_hardlinks', autospec=True)
+    @mock.patch('util.makedirs', autospec=True)
+    @mock.patch('NFSSR.Lock', autospec=True)
+    @mock.patch('nfs.soft_mount', autospec=True)
+    @mock.patch('nfs.unmount', autospec=True)
+    @mock.patch('util._testHost', autospec=True)
+    @mock.patch('nfs.check_server_tcp', autospec=True)
+    @mock.patch('nfs.validate_nfsversion', autospec=True)
+    def test_attach_not_writable(self, validate_nfsversion, check_server_tcp,
+                                 _testhost, unmount, soft_mount, Lock, makedirs,
+                                 mock_checklinks, mock_checkwritable,
+                                 mock_checkmount):
+        events = []
+
+        def is_mounted():
+            return len(events) % 2 == 1
+
+        def fake_soft_mount(*args, **kwargs):
+            assert not is_mounted()
+            events.append("mount")
+
+        def fake_unmount(*args, **kwargs):
+            assert is_mounted()
+            events.append("unmount")
+
+        mock_checkmount.side_effect = lambda *args: is_mounted()
+        soft_mount.side_effect = fake_soft_mount
+        unmount.side_effect = fake_unmount
+        mock_checkwritable.side_effect = SR.SRException("aFailure")
+
+        nfssr = self.create_nfssr(sr_uuid='UUID')
+
+        with self.assertRaises(SR.SRException):
+            nfssr.attach(None)
+
+        soft_mount.assert_called_once()
+        unmount.assert_called_once_with('/var/run/sr-mount/UUID', True)
+
     @mock.patch('NFSSR.Lock', autospec=True)
     def test_load_ipv6(self, mock_lock):
         nfssr = self.create_nfssr(server='::1')

tests/test_SMBSR.py

@@ -126,6 +126,78 @@ def test_attach_with_cifs_password_and_domain(
         # We mocked listdir as this calls pread and assert_called_with only records the last call.
         pread.assert_called_with(['mount.cifs', '\\aServer', "/var/mount", '-o', 'cache=loose,vers=3.0,actimeo=0,domain=citrix'], new_env={'PASSWD': 'winter2019', 'USER': 'jsmith'})
 
+    @mock.patch('FileSR.SharedFileSR._check_writable', autospec=True)
+    @mock.patch('FileSR.SharedFileSR._check_hardlinks', autospec=True)
+    @mock.patch('SMBSR.SMBSR.checkmount', autospec=True)
+    @mock.patch('SMBSR.SMBSR.mount', autospec=True)
+    @mock.patch('SMBSR.SMBSR.unmount', autospec=True)
+    @mock.patch('SMBSR.Lock', autospec=True)
+    @mock.patch('os.symlink', autospec=True)
+    @mock.patch('os.unlink', autospec=True)
+    @mock.patch('util.pathexists', autospec=True)
+    def test_attach_not_writable(self, mock_pathexists, mock_unlink,
+                                 mock_symlink, mock_lock, mock_unmount,
+                                 mock_mount, mock_checkmount, mock_checklinks,
+                                 mock_checkwritable):
+        events = []
+
+        def is_mounted():
+            return len([ev for ev in events if ev.endswith("mount")]) % 2 == 1
+
+        def fake_mount(*args, **kwargs):
+            assert not is_mounted()
+            events.append("mount")
+
+        def fake_unmount(*args, **kwargs):
+            assert is_mounted()
+            events.append("unmount")
+
+        def link_exists():
+            return len([ev for ev in events if ev.endswith("link")]) % 2 == 1
+
+        def fake_symlink(*args, **kwargs):
+            assert not link_exists()
+            events.append("symlink")
+
+        def fake_unlink(*args, **kwargs):
+            assert link_exists()
+            events.append("unlink")
+
+        mock_checkmount.side_effect = lambda *args: is_mounted()
+        mock_mount.side_effect = fake_mount
+        mock_unmount.side_effect = fake_unmount
+        mock_pathexists.side_effect = lambda *args: link_exists()
+        mock_symlink.side_effect = fake_symlink
+        mock_unlink.side_effect = fake_unlink
+        mock_checkwritable.side_effect = SR.SRException("aFailure")
+
+        smbsr = self.create_smbsr()
+        with self.assertRaises(SR.SRException):
+            smbsr.attach('asr_uuid')
+        mock_mount.assert_called_once()
+        mock_unmount.assert_called_once_with(smbsr, smbsr.mountpoint, True)
+        mock_unlink.assert_called_once_with(smbsr.path)
+
+    @mock.patch('SMBSR.SMBSR.checkmount', autospec=True)
+    @mock.patch('SMBSR.SMBSR.mount', autospec=True)
+    @mock.patch('SMBSR.SMBSR.unmount', autospec=True)
+    @mock.patch('SMBSR.Lock', autospec=True)
+    @mock.patch('os.unlink', autospec=True)
+    @mock.patch('util.pathexists', autospec=True)
+    def test_attach_misc_mount_failure(self, mock_pathexists, mock_unlink,
+                                       mock_lock, mock_unmount,
+                                       mock_mount, mock_checkmount):
+        mock_mount.side_effect = KeyError
+        mock_checkmount.return_value = False
+        mock_pathexists.return_value = False
+
+        smbsr = self.create_smbsr()
+        with self.assertRaises(KeyError):
+            smbsr.attach('asr_uuid')
+
+        mock_unmount.assert_not_called()
+        mock_unlink.assert_not_called()
+
     #Detach
     @testlib.with_context
     @mock.patch('SMBSR.SMBSR.checkmount', return_value=True, autospec=True)