Skip to content

Commit

Permalink
temporary workaround for SSL issue, so that P0 tests can still run ag…
Browse files Browse the repository at this point in the history 
…ainst production slot of int environment
  • Loading branch information
@danliu
danliu committed Aug 20, 2014
1 parent 581aa1e commit 64bd4b0
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 36 deletions.
48 changes: 29 additions & 19 deletions ...Gallery.FunctionalTests/ClientIntegrationTests/UploadAndDownload/NuGetCommandLineTests.cs
View file
Expand Up @@ -12,48 +12,58 @@ namespace NuGetGallery.FunctionalTests.ClientIntegrationTests
/// </summary>
// All the tests in this class fail due to the following error
// The package upload via Nuget.exe didnt succeed properly OR package download from V2 feed didnt work. Could not establish trust relationship for the SSL/TLS secure channel
//[TestClass]
[TestClass]
public class NugetCommandLineTests : GalleryTestBase
{
[TestMethod]
[Description("Downloads a package using NuGet.exe and checks if the package file is present in the output dir")]
[Priority(0)]
public void DownloadPackageWithNuGetCommandLineTest()
{
string packageId = Constants.TestPackageId; //try to down load a pre-defined test package.
ClientSDKHelper.ClearLocalPackageFolder(packageId);
int exitCode = CmdLineHelper.InstallPackage(packageId, UrlHelper.V2FeedRootUrl, Environment.CurrentDirectory);
Assert.IsTrue((exitCode == 0), Constants.PackageDownloadFailureMessage);
Assert.IsTrue(ClientSDKHelper.CheckIfPackageInstalled(packageId), Constants.PackageInstallFailureMessage);
// Temporary work around for the SSL issue, which keeps the upload tests from working on sites with cloudapp.net
if (UrlHelper.BaseUrl.Contains("nugettest.org") || UrlHelper.BaseUrl.Contains("nuget.org"))
{
string packageId = Constants.TestPackageId; //try to down load a pre-defined test package.
ClientSDKHelper.ClearLocalPackageFolder(packageId);
int exitCode = CmdLineHelper.InstallPackage(packageId, UrlHelper.V2FeedRootUrl, Environment.CurrentDirectory);
Assert.IsTrue((exitCode == 0), Constants.PackageDownloadFailureMessage);
Assert.IsTrue(ClientSDKHelper.CheckIfPackageInstalled(packageId), Constants.PackageInstallFailureMessage);
}
}

[TestMethod]
[Description("Creates a test package and pushes it to the server using Nuget.exe")]
[Priority(0)]
public void UploadPackageWithNuGetCommandLineTest()
{
AssertAndValidationHelper.UploadNewPackageAndVerify(DateTime.Now.Ticks.ToString());
if (UrlHelper.BaseUrl.Contains("nugettest.org") || UrlHelper.BaseUrl.Contains("nuget.org"))
{
AssertAndValidationHelper.UploadNewPackageAndVerify(DateTime.Now.Ticks.ToString());
}
}

[TestMethod]
[Description("Creates a test package with minclientversion tag and .cs name. Pushes it to the server using Nuget.exe and then download via ClientSDK")]
[Priority(0)]
public void UploadAndDownLoadPackageWithMinClientVersion()
{
string packageId = DateTime.Now.Ticks.ToString() + "PackageWithDotCsNames.Cs";
string version = "1.0.0";
string packageFullPath = PackageCreationHelper.CreatePackageWithMinClientVersion(packageId, version, "2.3");
int exitCode = CmdLineHelper.UploadPackage(packageFullPath, UrlHelper.V2FeedPushSourceUrl);
Assert.IsTrue((exitCode == 0), Constants.UploadFailureMessage);
Assert.IsTrue(ClientSDKHelper.CheckIfPackageVersionExistsInSource(packageId, version, UrlHelper.V2FeedRootUrl), Constants.PackageNotFoundAfterUpload, packageId, UrlHelper.V2FeedRootUrl);

//Delete package from local disk so once it gets uploaded
if (File.Exists(packageFullPath))
if (UrlHelper.BaseUrl.Contains("nugettest.org") || UrlHelper.BaseUrl.Contains("nuget.org"))
{
File.Delete(packageFullPath);
Directory.Delete(Path.GetFullPath(Path.GetDirectoryName(packageFullPath)), true);
string packageId = DateTime.Now.Ticks.ToString() + "PackageWithDotCsNames.Cs";
string version = "1.0.0";
string packageFullPath = PackageCreationHelper.CreatePackageWithMinClientVersion(packageId, version, "2.3");
int exitCode = CmdLineHelper.UploadPackage(packageFullPath, UrlHelper.V2FeedPushSourceUrl);
Assert.IsTrue((exitCode == 0), Constants.UploadFailureMessage);
Assert.IsTrue(ClientSDKHelper.CheckIfPackageVersionExistsInSource(packageId, version, UrlHelper.V2FeedRootUrl), Constants.PackageNotFoundAfterUpload, packageId, UrlHelper.V2FeedRootUrl);

//Delete package from local disk so once it gets uploaded
if (File.Exists(packageFullPath))
{
File.Delete(packageFullPath);
Directory.Delete(Path.GetFullPath(Path.GetDirectoryName(packageFullPath)), true);
}
AssertAndValidationHelper.DownloadPackageAndVerify(packageId);
}
AssertAndValidationHelper.DownloadPackageAndVerify(packageId);
}
}
}
40 changes: 23 additions & 17 deletions tests/NuGetGallery.FunctionalTests/ODataTests/FeedTests/CuratedFeedTest.cs
View file
Expand Up @@ -27,39 +27,45 @@ public void SearchMicrosoftDotNetCuratedFeed()

// This test fails due to the following error
// The package upload via Nuget.exe didnt succeed properly. Could not establish trust relationship for the SSL/TLS secure channel
//[TestMethod]
[TestMethod]
[Description("Performs a querystring-based search of the Windows 8 curated feed. Confirms expected packages are returned.")]
[Priority(0)]
public void SearchWindows8CuratedFeed()
{
string packageName = "NuGetGallery.FunctionalTests.SearchWindows8CuratedFeed";
string ticks = DateTime.Now.Ticks.ToString();
string version = new System.Version(ticks.Substring(0, 6) + "." + ticks.Substring(6, 6) + "." + ticks.Substring(12, 6)).ToString();
// Temporary workaround for the SSL issue, which keeps the upload test from working with cloudapp.net sites
if (UrlHelper.BaseUrl.Contains("nugettest.org") || UrlHelper.BaseUrl.Contains("nuget.org"))
{
string packageName = "NuGetGallery.FunctionalTests.SearchWindows8CuratedFeed";
string ticks = DateTime.Now.Ticks.ToString();
string version = new System.Version(ticks.Substring(0, 6) + "." + ticks.Substring(6, 6) + "." + ticks.Substring(12, 6)).ToString();

int exitCode = UploadPackageToCuratedFeed(packageName, version, FeedType.Windows8CuratedFeed);
Assert.IsTrue((exitCode == 0), Constants.UploadFailureMessage);
int exitCode = UploadPackageToCuratedFeed(packageName, version, FeedType.Windows8CuratedFeed);
Assert.IsTrue((exitCode == 0), Constants.UploadFailureMessage);

bool applied = CheckPackageExistInCuratedFeed(packageName, FeedType.Windows8CuratedFeed);
Assert.IsTrue(applied, Constants.PackageNotFoundAfterUpload, packageName, UrlHelper.Windows8CuratedFeedUrl);
bool applied = CheckPackageExistInCuratedFeed(packageName, FeedType.Windows8CuratedFeed);
Assert.IsTrue(applied, Constants.PackageNotFoundAfterUpload, packageName, UrlHelper.Windows8CuratedFeedUrl);
}
}

// This test fails due to the following error
// The package upload via Nuget.exe didnt succeed properly. Could not establish trust relationship for the SSL/TLS secure channel
//[TestMethod]
//[TestMethod]
[TestMethod]
[Description("Performs a querystring-based search of the WebMatrix curated feed. Confirms expected packages are returned.")]
[Priority(0)]
public void SearchWebMatrixCuratedFeed()
{
string packageName = "NuGetGallery.FunctionalTests.SearchWebMatrixCuratedFeed";
string ticks = DateTime.Now.Ticks.ToString();
string version = new System.Version(ticks.Substring(0, 6) + "." + ticks.Substring(6, 6) + "." + ticks.Substring(12, 6)).ToString();
if (UrlHelper.BaseUrl.Contains("nugettest.org") || UrlHelper.BaseUrl.Contains("nuget.org"))
{
string packageName = "NuGetGallery.FunctionalTests.SearchWebMatrixCuratedFeed";
string ticks = DateTime.Now.Ticks.ToString();
string version = new System.Version(ticks.Substring(0, 6) + "." + ticks.Substring(6, 6) + "." + ticks.Substring(12, 6)).ToString();

int exitCode = UploadPackageToCuratedFeed(packageName, version, FeedType.WebMatrixCuratedFeed);
Assert.IsTrue((exitCode == 0), Constants.UploadFailureMessage);
int exitCode = UploadPackageToCuratedFeed(packageName, version, FeedType.WebMatrixCuratedFeed);
Assert.IsTrue((exitCode == 0), Constants.UploadFailureMessage);

bool applied = CheckPackageExistInCuratedFeed(packageName, FeedType.WebMatrixCuratedFeed);
Assert.IsTrue(applied, Constants.PackageNotFoundAfterUpload, packageName, UrlHelper.WebMatrixCuratedFeedUrl);
bool applied = CheckPackageExistInCuratedFeed(packageName, FeedType.WebMatrixCuratedFeed);
Assert.IsTrue(applied, Constants.PackageNotFoundAfterUpload, packageName, UrlHelper.WebMatrixCuratedFeedUrl);
}
}

[TestMethod]
Expand Down

0 comments on commit 64bd4b0

Please sign in to comment.