Moving the host start process into the try block
To make sure the host process is not left unkilled after a failure in host start complete.
This commit is contained in:
parent
c5f2b4054f
commit
022ff067ad
|
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
|
@ -33,10 +34,11 @@ namespace E2ETests
|
||||||
Environment.SetEnvironmentVariable("SQLAZURECONNSTR_IdentityConnection", string.Format(Connection_string_Format, musicStoreIdentityDbName));
|
Environment.SetEnvironmentVariable("SQLAZURECONNSTR_IdentityConnection", string.Format(Connection_string_Format, musicStoreIdentityDbName));
|
||||||
|
|
||||||
ApplicationBaseUrl = applicationBaseUrl;
|
ApplicationBaseUrl = applicationBaseUrl;
|
||||||
var hostProcess = DeploymentUtility.StartApplication(hostType, kreFlavor, musicStoreIdentityDbName);
|
Process hostProcess = null;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
hostProcess = DeploymentUtility.StartApplication(hostType, kreFlavor, musicStoreIdentityDbName);
|
||||||
httpClientHandler = new HttpClientHandler();
|
httpClientHandler = new HttpClientHandler();
|
||||||
httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(applicationBaseUrl) };
|
httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(applicationBaseUrl) };
|
||||||
|
|
||||||
|
|
@ -104,8 +106,11 @@ namespace E2ETests
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
//Shutdown the host process
|
if (hostProcess != null)
|
||||||
hostProcess.Kill();
|
{
|
||||||
|
//Shutdown the host process
|
||||||
|
hostProcess.Kill();
|
||||||
|
}
|
||||||
|
|
||||||
DbUtils.DropDatabase(musicStoreDbName);
|
DbUtils.DropDatabase(musicStoreDbName);
|
||||||
DbUtils.DropDatabase(musicStoreIdentityDbName);
|
DbUtils.DropDatabase(musicStoreIdentityDbName);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue