Skip tests that rely on snapshots for platforms where snapshots are not available

Add required system packages that are missing on debian 12 and fedora 39

Author: cmcgee1024

Sources/LinuxPlatform/Linux.swift

@@ -202,6 +202,8 @@ public struct Linux: Platform {
                 "libuuid-devel",
                 "libxml2-devel",
                 "python3-devel",
+                "libstdc++-devel",
+                "libstdc++-static",
             ]
         case "debian12":
             [
@@ -218,6 +220,7 @@ public struct Linux: Platform {
                 "tzdata",
                 "git",
                 "gcc",
+                "libstdc++-12-dev",
             ]
         default:
             []

Tests/SwiftlyTests/InstallTests.swift

@@ -39,6 +39,9 @@ final class InstallTests: SwiftlyTests {
 
     /// Tests that `swiftly install a.b` installs the latest patch version of Swift a.b.
     func testInstallLatestPatchVersion() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         guard try await self.baseTestConfig().platform.name != "ubi9" else {
             print("Skipping test due to insufficient download availability for ubi9")
             return
@@ -133,6 +136,9 @@ final class InstallTests: SwiftlyTests {
 
     /// Tests that `swiftly install main-snapshot` installs the latest available main snapshot.
     func testInstallLatestMainSnapshot() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         try await self.withTestHome {
             try await self.withMockedToolchain {
                 var cmd = try self.parseCommand(Install.self, ["install", "main-snapshot", "--post-install-file=\(Swiftly.currentPlatform.getTempFilePath().path)"])
@@ -165,6 +171,9 @@ final class InstallTests: SwiftlyTests {
 
     /// Tests that `swiftly install a.b-snapshot` installs the latest available a.b release snapshot.
     func testInstallLatestReleaseSnapshot() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         try await self.withTestHome {
             try await self.withMockedToolchain {
                 var cmd = try self.parseCommand(Install.self, ["install", "6.0-snapshot", "--post-install-file=\(Swiftly.currentPlatform.getTempFilePath().path)"])
@@ -249,12 +258,18 @@ final class InstallTests: SwiftlyTests {
 
     /// Tests that attempting to install main snapshots that are already installed doesn't result in an error.
     func testInstallDuplicateMainSnapshots() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         try await self.duplicateTest("main-snapshot-2023-04-01")
         try await self.duplicateTest("main-snapshot")
     }
 
     /// Tests that attempting to install release snapshots that are already installed doesn't result in an error.
     func testInstallDuplicateReleaseSnapshots() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         try await self.duplicateTest("6.0-snapshot-2024-06-18")
         try await self.duplicateTest("6.0-snapshot")
     }

Tests/SwiftlyTests/SwiftlyTests.swift

@@ -373,6 +373,20 @@ class SwiftlyTests: XCTestCase {
         let toolchainVersion = String(decoding: outputData, as: UTF8.self).trimmingCharacters(in: .newlines)
         return try ToolchainVersion(parsing: toolchainVersion)
     }
+
+    func snapshotsAvailable() async throws -> Bool {
+        let pd = try await Swiftly.currentPlatform.detectPlatform(disableConfirmation: true, platform: nil)
+
+        // Snapshots are currently unavailable for these platforms on swift.org
+        // TODO: remove these once snapshots are available for them
+        let snapshotsUnavailable = [
+            PlatformDefinition.ubuntu2404,
+            PlatformDefinition.fedora39,
+            PlatformDefinition.debian12,
+        ]
+
+        return !snapshotsUnavailable.contains(pd)
+    }
 }
 
 public class TestOutputHandler: SwiftlyCore.OutputHandler {

Tests/SwiftlyTests/UpdateTests.swift

@@ -84,6 +84,9 @@ final class UpdateTests: SwiftlyTests {
 
     /// Verify that a toolchain can be updated to the latest patch version of that toolchain's minor version.
     func testUpdateToLatestPatch() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         try await self.withTestHome {
             try await self.withMockedToolchain {
                 try await self.installMockedToolchain(selector: "5.9.0")
@@ -111,16 +114,16 @@ final class UpdateTests: SwiftlyTests {
     func testUpdateInUse() async throws {
         try await self.withTestHome {
             try await self.withMockedToolchain {
-                try await self.installMockedToolchain(selector: "5.9.0")
+                try await self.installMockedToolchain(selector: "6.0.0")
 
                 var update = try self.parseCommand(Update.self, ["update", "-y", "--no-verify", "--post-install-file=\(Swiftly.currentPlatform.getTempFilePath().path)"])
                 try await update.run()
 
                 let config = try Config.load()
                 let inUse = config.inUse!.asStableRelease!
-                XCTAssertGreaterThan(inUse, .init(major: 5, minor: 9, patch: 0))
-                XCTAssertEqual(inUse.major, 5)
-                XCTAssertEqual(inUse.minor, 9)
+                XCTAssertGreaterThan(inUse, .init(major: 6, minor: 0, patch: 0))
+                XCTAssertEqual(inUse.major, 6)
+                XCTAssertEqual(inUse.minor, 0)
                 XCTAssertGreaterThan(inUse.patch, 0)
 
                 try await self.validateInstalledToolchains(
@@ -135,6 +138,9 @@ final class UpdateTests: SwiftlyTests {
 
     /// Verifies that snapshots, both from the main branch and from development branches, can be updated.
     func testUpdateSnapshot() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         let branches: [ToolchainVersion.Snapshot.Branch] = [
             .main,
             .release(major: 6, minor: 0),
@@ -170,20 +176,20 @@ final class UpdateTests: SwiftlyTests {
     func testUpdateSelectsLatestMatchingStableRelease() async throws {
         try await self.withTestHome {
             try await self.withMockedToolchain {
-                try await self.installMockedToolchain(selector: "5.9.1")
-                try await self.installMockedToolchain(selector: "5.9.0")
+                try await self.installMockedToolchain(selector: "6.0.1")
+                try await self.installMockedToolchain(selector: "6.0.0")
 
-                var update = try self.parseCommand(Update.self, ["update", "-y", "5.9", "--no-verify", "--post-install-file=\(Swiftly.currentPlatform.getTempFilePath().path)"])
+                var update = try self.parseCommand(Update.self, ["update", "-y", "6.0", "--no-verify", "--post-install-file=\(Swiftly.currentPlatform.getTempFilePath().path)"])
                 try await update.run()
 
                 let config = try Config.load()
                 let inUse = config.inUse!.asStableRelease!
-                XCTAssertEqual(inUse.major, 5)
-                XCTAssertEqual(inUse.minor, 9)
+                XCTAssertEqual(inUse.major, 6)
+                XCTAssertEqual(inUse.minor, 0)
                 XCTAssertGreaterThan(inUse.patch, 1)
 
                 try await self.validateInstalledToolchains(
-                    [config.inUse!, .init(major: 5, minor: 9, patch: 0)],
+                    [config.inUse!, .init(major: 6, minor: 0, patch: 0)],
                     description: "update with ambiguous selector should update the latest matching toolchain"
                 )
             }
@@ -192,6 +198,9 @@ final class UpdateTests: SwiftlyTests {
 
     /// Verify that the latest of all the matching snapshot toolchains is updated.
     func testUpdateSelectsLatestMatchingSnapshotRelease() async throws {
+        let snapshotsAvailable = try await self.snapshotsAvailable()
+        try XCTSkipIf(!snapshotsAvailable)
+
         let branches: [ToolchainVersion.Snapshot.Branch] = [
             .main,
             .release(major: 6, minor: 0),