huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating deployment helpers to start the host on mono.

This commit is contained in:
Praburaj 2014-08-26 16:48:39 -07:00
parent e60b1665e3
commit 963c76f770
2 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
test/E2ETests/DeploymentUtility.cs
View File

@ -1,12 +1,13 @@
using System; using System;
using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Threading; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading;
using Microsoft.Framework.Runtime; using Microsoft.Framework.Runtime;
using Microsoft.Framework.Runtime.Infrastructure; using Microsoft.Framework.Runtime.Infrastructure;
using System.ComponentModel;
namespace E2ETests namespace E2ETests
{ {
@ -56,26 +57,31 @@ namespace E2ETests
public static Process StartApplication(ServerType hostType, KreFlavor kreFlavor, KreArchitecture kreArchitecture, string identityDbName) public static Process StartApplication(ServerType hostType, KreFlavor kreFlavor, KreArchitecture kreArchitecture, string identityDbName)
{ {
if (kreFlavor == KreFlavor.Mono)
{
throw new NotImplementedException("Not implemented for Mono");
}
string applicationPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, APP_RELATIVE_PATH)); string applicationPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, APP_RELATIVE_PATH));
//Tweak the %PATH% to the point to the right KREFLAVOR
Environment.SetEnvironmentVariable("PATH", SwitchPathToKreFlavor(kreFlavor, kreArchitecture));
var backupKreDefaultLibPath = Environment.GetEnvironmentVariable("KRE_DEFAULT_LIB"); var backupKreDefaultLibPath = Environment.GetEnvironmentVariable("KRE_DEFAULT_LIB");
//To avoid the KRE_DEFAULT_LIB of the test process flowing into Helios, set it to empty //To avoid the KRE_DEFAULT_LIB of the test process flowing into Helios, set it to empty
Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", string.Empty); Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", string.Empty);
Process hostProcess = null; Process hostProcess = null;
if (hostType == ServerType.Helios) if (kreFlavor == KreFlavor.Mono)
{ {
hostProcess = StartHeliosHost(applicationPath, kreArchitecture); hostProcess = StartMonoHost(hostType, applicationPath);
} }
else else
{ {
hostProcess = StartSelfHost(hostType, applicationPath, identityDbName); //Tweak the %PATH% to the point to the right KREFLAVOR
Environment.SetEnvironmentVariable("PATH", SwitchPathToKreFlavor(kreFlavor, kreArchitecture));
if (hostType == ServerType.Helios)
{
hostProcess = StartHeliosHost(applicationPath, kreArchitecture);
}
else
{
hostProcess = StartSelfHost(hostType, applicationPath, identityDbName);
}
} }
//Restore the KRE_DEFAULT_LIB after starting the host process //Restore the KRE_DEFAULT_LIB after starting the host process
@ -83,6 +89,38 @@ namespace E2ETests
return hostProcess; return hostProcess;
} }
private static Process StartMonoHost(ServerType hostType, string applicationPath)
{
var path = Environment.GetEnvironmentVariable("PATH");
var kreBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Where(c => c.Contains("KRE-mono45")).FirstOrDefault();
if (string.IsNullOrWhiteSpace(kreBin))
{
throw new Exception("KRE not detected on the machine.");
}
var monoPath = Path.Combine(kreBin, "mono");
var klrMonoManaged = Path.Combine(kreBin, "klr.mono.managed.dll");
var applicationHost = Path.Combine(kreBin, "Microsoft.Framework.ApplicationHost");
Console.WriteLine(string.Format("Executing command: {0} {1} --appbase {2} {3} {4}", monoPath, klrMonoManaged, applicationPath, applicationHost, hostType.ToString()));
//https://github.com/aspnet/KRuntime/issues/580
var startInfo = new ProcessStartInfo
{
FileName = monoPath,
Arguments = string.Format("{0} --appbase {1} {2} {3}", klrMonoManaged, applicationPath, applicationHost, hostType.ToString()),
UseShellExecute = true,
CreateNoWindow = true
};
var hostProcess = Process.Start(startInfo);
Console.WriteLine("Started {0}. Process Id : {1}", hostProcess.MainModule.FileName, hostProcess.Id);
Thread.Sleep(5 * 1000);
return hostProcess;
}
private static Process StartHeliosHost(string applicationPath, KreArchitecture kreArchitecture) private static Process StartHeliosHost(string applicationPath, KreArchitecture kreArchitecture)
{ {
CopyAspNetLoader(applicationPath); CopyAspNetLoader(applicationPath);

7
test/E2ETests/SmokeTests.cs
View File

@ -77,11 +77,8 @@ namespace E2ETests
try try
{ {
if (!RunningOnMono) //Deployment helpers not setup for mono yet. Until then set the ApplicationBaseUrl to some static url.
{ hostProcess = DeploymentUtility.StartApplication(hostType, kreFlavor, architecture, musicStoreDbName);
//Deployment helpers not setup for mono yet. Until then set the ApplicationBaseUrl to some static url.
hostProcess = DeploymentUtility.StartApplication(hostType, kreFlavor, architecture, musicStoreDbName);
}
httpClientHandler = new HttpClientHandler(); httpClientHandler = new HttpClientHandler();
httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(applicationBaseUrl) }; httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(applicationBaseUrl) };