Fix broken tests (#2621)

* Update swift-tools-version to 5.7 in integration tests

* Fix flaky test

* Add missing AtomicCounter dependency in generated Package.swift

* Update swift-tools-version in integration test helper Swift projects

* Make test clearer

* Don't run MTELG integration test on Swift 5.11+

It hasn't been properly tested
This commit is contained in:
Gustavo Cairo authored and GitHub committed 2024-01-08 10:02:09 +00:00
1 parent f32c9a3931
commit 0c648c91c6
8 files changed
+22 -21

No files matched your search

@@ -40,7 +40,7 @@ function hooked_package_swift_start() {
shift 2
cat <<"EOF"
// swift-tools-version:5.1
// swift-tools-version:5.7
import PackageDescription
let package = Package(
@@ -61,8 +61,9 @@ EOF
cat <<EOF
],
dependencies: [
.package(url: "HookedFunctions/", .branch("main")),
.package(url: "$swiftpm_pkg_name/", .branch("main")),
.package(url: "HookedFunctions/", branch: "main"),
.package(url: "AtomicCounter/", branch: "main"),
.package(url: "$swiftpm_pkg_name/", branch: "main"),
EOF
if [[ -n "$extra_dependencies_file" ]]; then
cat "$extra_dependencies_file"
@@ -79,11 +80,11 @@ function hooked_package_swift_target() {
shift
local deps=""
for dep in "$@"; do
deps="$deps \"$dep\","
deps="$deps .product(name: \"$dep\", package: \"swift-nio\"),"
done
cat <<EOF
.target(name: "Test_$target_name", dependencies: [$deps]),
.target(name: "bootstrap_$target_name",
.target(name: "Test_$target_name", dependencies: [$deps "AtomicCounter"]),
.executableTarget(name: "bootstrap_$target_name",
dependencies: ["Test_$target_name", "HookedFunctions"]),
EOF
}
@@ -110,7 +111,7 @@ function dir_basename() {
function fake_package_swift() {
cat > Package.swift <<EOF
// swift-tools-version:5.0
// swift-tools-version:5.7
import PackageDescription
let package = Package(name: "$1")
@@ -1,4 +1,4 @@
// swift-tools-version:5.0
// swift-tools-version:5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.
//===----------------------------------------------------------------------===//
//
@@ -1,4 +1,4 @@
// swift-tools-version:5.0
// swift-tools-version:5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.
//===----------------------------------------------------------------------===//
//
@@ -22,7 +22,7 @@ let package = Package(
.library(name: "HookedFunctions", type: .dynamic, targets: ["HookedFunctions"]),
],
dependencies: [
.package(url: "../AtomicCounter/", .branch("main")),
.package(url: "../AtomicCounter/", branch: "main"),
],
targets: [
.target(name: "HookedFunctions", dependencies: ["AtomicCounter"]),
@@ -1,4 +1,4 @@
// swift-tools-version:5.0
// swift-tools-version:5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.
//===----------------------------------------------------------------------===//
//
@@ -22,7 +22,7 @@ let package = Package(
.library(name: "HookedFunctions", type: .dynamic, targets: ["HookedFunctions"]),
],
dependencies: [
.package(url: "../AtomicCounter/", .branch("main")),
.package(url: "../AtomicCounter/", branch: "main"),
],
targets: [
.target(name: "HookedFunctions", dependencies: ["AtomicCounter"]),
@@ -17,7 +17,7 @@ set -eu
function make_package() {
cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
// swift-tools-version:5.2
// swift-tools-version:5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription
@@ -180,7 +180,7 @@ struct EventLoopCrashTests {
NIOSingletons.groupLoopCountSuggestion = -1
}
#if compiler(>=5.9) // We only support Concurrency executor take-over on 5.9+
#if compiler(>=5.9) && swift(<5.11) // We only support Concurrency executor take-over on 5.9-5.10, as versions greater than 5.10 have not been properly tested.
let testInstallingSingletonMTELGAsConcurrencyExecutorWorksButOnlyOnce = CrashTest(
regex: #"Fatal error: Must be called only once"#
) {
@@ -207,6 +207,6 @@ struct EventLoopCrashTests {
// This should crash
_ = NIOSingletons.unsafeTryInstallSingletonPosixEventLoopGroupAsConcurrencyGlobalExecutor()
}
#endif // compiler(>=5.9)
#endif // compiler(>=5.9) && swift(<5.11)
}
#endif // !canImport(Darwin) || os(macOS)
@@ -860,18 +860,18 @@ final class NIOThrowingAsyncSequenceProducerTests: XCTestCase {
}
func testIteratorThrows_whenCancelled() async {
_ = self.source.yield(contentsOf: Array(0..<100))
_ = self.source.yield(contentsOf: Array(1...100))
await withThrowingTaskGroup(of: Void.self) { group in
group.addTask {
var counter = 0
var itemsYieldedCounter = 0
guard let sequence = self.sequence else {
return XCTFail("Expected to have an AsyncSequence")
}
do {
for try await next in sequence {
XCTAssertEqual(next, counter)
counter += 1
itemsYieldedCounter += 1
XCTAssertEqual(next, itemsYieldedCounter)
}
XCTFail("Expected that this throws")
} catch is CancellationError {
@@ -880,7 +880,7 @@ final class NIOThrowingAsyncSequenceProducerTests: XCTestCase {
XCTFail("Unexpected error: \(error)")
}
XCTAssertLessThan(counter, 100)
XCTAssertLessThanOrEqual(itemsYieldedCounter, 100)
}
group.cancelAll()
+1 -1
View File
@@ -51,7 +51,7 @@ function setup_swiftpm_package() {
cd "$destination"
cat > Package.swift <<"EOF"
// swift-tools-version:5.1
// swift-tools-version:5.7
import PackageDescription
var targets: [PackageDescription.Target] = [