Merge pull request #1175 from apple/revert-1172-disable-branch-test

aciidgh · web-flow · commit 6bb27929727a · 2017-05-11T09:33:23.000+05:30
Revert "[WorkspaceTests] Disable branch and revision test"
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -1109,10 +1109,6 @@ final class WorkspaceTests: XCTestCase {
     }
 
     func testBranchAndRevision() throws {
-        // This is failing on OS X package bots for some reason. However, it works locally and on incremental bots.
-        // 
-        // <rdar://problem/32076596> Test Case '-[WorkspaceTests.WorkspaceTests testBranchAndRevision]' started.--- bootstrap: error: tests failed with exit status 1
-      #if false
         typealias Package = PackageDescription4.Package
 
         mktmpdir { path in
@@ -1261,7 +1257,6 @@ final class WorkspaceTests: XCTestCase {
                     try GitRepository(path: workspace.checkoutsPath.appending(dependency.subpath)).getCurrentRevision())
             }
         }
-      #endif
     }
 
     func testMultipleRootPackages() throws {

Original file line number	Diff line number	Diff line change
`@@ -1109,10 +1109,6 @@ final class WorkspaceTests: XCTestCase {`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`	`1111`	`func testBranchAndRevision() throws {`
`1112`		`- // This is failing on OS X package bots for some reason. However, it works locally and on incremental bots.`
`1113`		`- //`
`1114`		`- // <rdar://problem/32076596> Test Case '-[WorkspaceTests.WorkspaceTests testBranchAndRevision]' started.--- bootstrap: error: tests failed with exit status 1`
`1115`		`- #if false`
`1116`	`1112`	`typealias Package = PackageDescription4.Package`
`1117`	`1113`
`1118`	`1114`	`mktmpdir { path in`
`@@ -1261,7 +1257,6 @@ final class WorkspaceTests: XCTestCase {`
`1261`	`1257`	`try GitRepository(path: workspace.checkoutsPath.appending(dependency.subpath)).getCurrentRevision())`
`1262`	`1258`	`}`
`1263`	`1259`	`}`
`1264`		`- #endif`
`1265`	`1260`	`}`
`1266`	`1261`
`1267`	`1262`	`func testMultipleRootPackages() throws {`