This commit is contained in:
Dor 2019-07-19 05:57:36 -07:00 коммит произвёл Kiran Challa
Родитель 1a1cc1ce1e
Коммит f8938cc50f
4 изменённых файлов: 0 добавлений и 108 удалений

Просмотреть файл

@ -7,9 +7,6 @@ namespace Microsoft.Oryx.Integration.Tests
{
internal class Constants
{
public const string OryxBuildpackBuilderImageName = "oryxdevmcr.azurecr.io/public/oryx/pack-builder";
public const string HerokuBuildpackBuilderImageName = "heroku/buildpacks:18";
// Common database settings. Use these settings for all database related tests and also make sure
// the sample apps use these to connect.

Просмотреть файл

@ -1,41 +0,0 @@
// --------------------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------
using Microsoft.Oryx.Tests.Common;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
namespace Microsoft.Oryx.Integration.Tests
{
[Trait("category", "node")]
public class NodeBuildpackTests : NodeEndToEndTestsBase
{
public NodeBuildpackTests(ITestOutputHelper output, TestTempDirTestFixture fixture) : base(output, fixture)
{
}
[Theory]
[InlineData(Constants.OryxBuildpackBuilderImageName)]
[InlineData(Constants.HerokuBuildpackBuilderImageName)]
public async Task CanBuildAndRun_NodeApp_WithBuildpack(string builder)
{
var appName = "webfrontend";
await EndToEndTestHelper.RunPackAndAssertAppAsync(
_output,
appName,
CreateAppVolume(appName),
"test-nodeapp",
builder,
async (hostPort) =>
{
var data = await _httpClient.GetStringAsync($"http://localhost:{hostPort}/");
Assert.Contains("Say It Again", data);
});
}
}
}

Просмотреть файл

@ -1,46 +0,0 @@
// --------------------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------
using Microsoft.Oryx.Tests.Common;
using System.IO;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
namespace Microsoft.Oryx.Integration.Tests
{
[Trait("category", "php")]
public class PhpBuildpackTest : PhpEndToEndTestsBase
{
public PhpBuildpackTest(ITestOutputHelper output, TestTempDirTestFixture fixture)
: base(output, fixture)
{
}
[Theory]
// [InlineData(Constants.OryxBuildpackBuilderImageName)] // AB#896178
[InlineData(Constants.HerokuBuildpackBuilderImageName)]
// Twig does not support PHP < 7
public async Task TwigExample_WithBuildpack(string builder)
{
// Arrange
var appName = "twig-example";
var appVolume = DockerVolume.CreateMirror(Path.Combine(_hostSamplesDir, "php", appName));
// Act & Assert
await EndToEndTestHelper.RunPackAndAssertAppAsync(
_output,
appName,
appVolume,
"test-phpapp",
builder,
async (hostPort) =>
{
var data = await _httpClient.GetStringAsync($"http://localhost:{hostPort}/");
Assert.Contains("<h1>Hello World!</h1>", data);
});
}
}
}

Просмотреть файл

@ -55,24 +55,6 @@ namespace Microsoft.Oryx.Integration.Tests
});
}
[Fact(Skip = "AB#896178")]
public async Task CanBuildAndRunPythonApp_WithBuildpack()
{
var appName = "flask-app";
await EndToEndTestHelper.RunPackAndAssertAppAsync(
_output,
appName,
CreateAppVolume(appName),
"test-py37app",
Constants.OryxBuildpackBuilderImageName,
async (hostPort) =>
{
var data = await _httpClient.GetStringAsync($"http://localhost:{hostPort}/");
Assert.Contains("Hello World!", data);
});
}
[Fact]
public async Task CanBuildAndRunPythonApp_UsingPython37_AndVirtualEnv()
{