Skip to content

[Test Controller] New test controller applied to Compute #8273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 0 additions & 194 deletions src/Compute/Compute.Test/Common/ComputeTestController.cs

This file was deleted.

32 changes: 14 additions & 18 deletions src/Compute/Compute.Test/ScenarioTests/AEMExtensionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,104 +12,100 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.Azure.ServiceManagement.Common.Models;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;

namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
{
public class AEMExtensionTests
public class AEMExtensionTests : ComputeTestRunner
{
XunitTracingInterceptor _logger;

public AEMExtensionTests(Xunit.Abstractions.ITestOutputHelper output)
: base(output)
{
_logger = new XunitTracingInterceptor(output);
XunitTracingInterceptor.AddToContext(_logger);
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionBasicWindowsWAD()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionBasicWindowsWAD");
TestRunner.RunTestScript("Test-AEMExtensionBasicWindowsWAD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionBasicWindows()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionBasicWindows");
TestRunner.RunTestScript("Test-AEMExtensionBasicWindows");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionBasicLinuxWAD()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionBasicLinuxWAD");
TestRunner.RunTestScript("Test-AEMExtensionBasicLinuxWAD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionBasicLinux()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionBasicLinux");
TestRunner.RunTestScript("Test-AEMExtensionBasicLinux");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedWindowsWAD()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedWindowsWAD");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedWindowsWAD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedWindows()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedWindows");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedWindows");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedLinuxWAD()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedLinuxWAD");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedLinuxWAD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedLinux()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedLinux");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedLinux");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedWindowsMD()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedWindowsMD");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedWindowsMD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedLinuxMD()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedLinuxMD");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedLinuxMD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedLinuxMD_ESeries()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedLinuxMD_E");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedLinuxMD_E");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAEMExtensionAdvancedLinuxMD_DSeries()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AEMExtensionAdvancedLinuxMD_D");
TestRunner.RunTestScript("Test-AEMExtensionAdvancedLinuxMD_D");
}
}
}
10 changes: 3 additions & 7 deletions src/Compute/Compute.Test/ScenarioTests/AddVhdTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,23 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.Azure.ServiceManagement.Common.Models;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;

namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
{
public class AddVhdTests
public class AddVhdTests : ComputeTestRunner
{
public XunitTracingInterceptor _logger;

public AddVhdTests(Xunit.Abstractions.ITestOutputHelper output)
: base(output)
{
_logger = new XunitTracingInterceptor(output);
XunitTracingInterceptor.AddToContext(_logger);
}

[Fact(Skip = "TODO: only works for live mode")]
[Trait(Category.RunType, Category.LiveOnly)]
public void TestAddVhd()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AddVhd");
TestRunner.RunTestScript("Test-AddVhd");
}
}
}
10 changes: 3 additions & 7 deletions src/Compute/Compute.Test/ScenarioTests/AvailabilitySetTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,23 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.Azure.ServiceManagement.Common.Models;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;

namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
{
public class AvailabilitySetTests
public class AvailabilitySetTests : ComputeTestRunner
{
XunitTracingInterceptor _logger;

public AvailabilitySetTests(Xunit.Abstractions.ITestOutputHelper output)
: base(output)
{
_logger = new XunitTracingInterceptor(output);
XunitTracingInterceptor.AddToContext(_logger);
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAvailabilitySet()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-AvailabilitySet");
TestRunner.RunTestScript("Test-AvailabilitySet");
}
}
}
Loading