Skip to content

Fix skipping of tests and skip some additional ones #2984

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.

Sign up for GitHub

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 1 commit into from
Oct 16, 2020
Merged

Fix skipping of tests and skip some additional ones #2984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion Tests/FunctionalTests/CFamilyTargetTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ class CFamilyTargetTestCase: XCTestCase {
}
}

func testObjectiveCPackageWithTestTarget(){
func testObjectiveCPackageWithTestTarget() throws {
// <rdar://problem/70382477> Fix and re-enable tests which run `swift test` on newly created packages
try XCTSkipIf(true)

#if os(macOS)
fixture(name: "CFamilyTargets/ObjCmacOSPackage") { prefix in
// Build the package.
Expand Down
8 changes: 4 additions & 4 deletions Tests/FunctionalTests/MiscellaneousTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ class MiscellaneousTestCase: XCTestCase {

func testSwiftTestParallel() throws {
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
try XCTSkip()
try XCTSkipIf(true)

fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in
// First try normal serial testing.
Expand Down Expand Up @@ -262,7 +262,7 @@ class MiscellaneousTestCase: XCTestCase {

func testSwiftTestFilter() throws {
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
try XCTSkip()
try XCTSkipIf(true)

fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in
let (stdout, _) = try SwiftPMProduct.SwiftTest.execute(["--filter", ".*1", "-l", "--enable-test-discovery"], packagePath: prefix)
Expand All @@ -281,7 +281,7 @@ class MiscellaneousTestCase: XCTestCase {

func testSwiftTestSkip() throws {
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
try XCTSkip()
try XCTSkipIf(true)

fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in
let (stdout, _) = try SwiftPMProduct.SwiftTest.execute(["--skip", "ParallelTestsTests", "-l", "--enable-test-discovery"], packagePath: prefix)
Expand Down Expand Up @@ -424,7 +424,7 @@ class MiscellaneousTestCase: XCTestCase {

func testSwiftTestLinuxMainGeneration() throws {
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
try XCTSkip()
try XCTSkipIf(true)

#if os(macOS)
fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in
Expand Down
5 changes: 4 additions & 1 deletion Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ import Commands
import Workspace

class SwiftPMXCTestHelperTests: XCTestCase {
func testBasicXCTestHelper() {
func testBasicXCTestHelper() throws {
// <rdar://problem/70382477> Fix and re-enable tests which run `swift test` on newly created packages
try XCTSkipIf(true)

#if os(macOS)
fixture(name: "Miscellaneous/SwiftPMXCTestHelper") { prefix in
// Build the package.
Expand Down
3 changes: 3 additions & 0 deletions Tests/WorkspaceTests/InitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@ class InitTests: XCTestCase {
}

func testNonC99NameExecutablePackage() throws {
// <rdar://problem/70382477> Fix and re-enable tests which run `swift test` on newly created packages
try XCTSkipIf(true)

try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
XCTAssertTrue(localFileSystem.isDirectory(tempDirPath))

Expand Down