zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-596: Ensured open server connection gets closed when session start failed.

Browse source
This commit is contained in:
Damian Büchel 2022-08-24 10:25:41 +02:00
parent 2d34ed30eb
commit cb3cee7e4e
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SafeExamBrowser.Runtime.UnitTests/Operations/ServerOperationTests.cs
View file

@ -591,7 +591,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
} }
[TestMethod] [TestMethod]
public void Revert_MustDisconnectFromServer() public void Revert_MustDisconnectFromServerWhenSessionRunning()
{ {
context.Current.Settings.SessionMode = SessionMode.Server; context.Current.Settings.SessionMode = SessionMode.Server;
server.Setup(s => s.Disconnect()).Returns(new ServerResponse(true)); server.Setup(s => s.Disconnect()).Returns(new ServerResponse(true));
@ -604,6 +604,21 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
Assert.AreEqual(OperationResult.Success, result); Assert.AreEqual(OperationResult.Success, result);
} }
[TestMethod]
public void Revert_MustDisconnectFromServerWhenSessionStartFailed()
{
context.Current = default;
context.Next.Settings.SessionMode = SessionMode.Server;
server.Setup(s => s.Disconnect()).Returns(new ServerResponse(true));
var result = sut.Revert();
fileSystem.VerifyNoOtherCalls();
server.Verify(s => s.Disconnect(), Times.Once);
Assert.AreEqual(OperationResult.Success, result);
}
[TestMethod] [TestMethod]
public void Revert_MustFailWhenDisconnectionUnsuccesful() public void Revert_MustFailWhenDisconnectionUnsuccesful()
{ {

2
SafeExamBrowser.Runtime/Operations/ServerOperation.cs
View file

@ -122,7 +122,7 @@ namespace SafeExamBrowser.Runtime.Operations
{ {
var result = OperationResult.Success; var result = OperationResult.Success;
if (Context.Current?.Settings.SessionMode == SessionMode.Server) if (Context.Current?.Settings.SessionMode == SessionMode.Server || Context.Next.Settings.SessionMode == SessionMode.Server)
{ {
logger.Info("Finalizing server..."); logger.Info("Finalizing server...");
StatusChanged?.Invoke(TextKey.OperationStatus_FinalizeServer); StatusChanged?.Invoke(TextKey.OperationStatus_FinalizeServer);