Skip to content

Commit a970f12

Browse files
authored
Run unit tests sequentially to work around them hanging (#1172)
See also #1173
2 parents de2b4e4 + 6c59d1f commit a970f12

File tree

4 files changed

+43
-11
lines changed

4 files changed

+43
-11
lines changed

.swiftlint.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ excluded:
66
- fastlane
77
- vendor
88
- External
9+
- DerivedData
910

1011
# Rules
1112
only_rules:
@@ -53,8 +54,8 @@ only_rules:
5354

5455
# Rules configuration
5556

56-
control_statement:
57-
severity: error
57+
control_statement:
58+
severity: error
5859

5960
custom_rules:
6061

Simplenote.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
37D4DD6920B3574C00C225EA /* WPAuthHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPAuthHandler.h; sourceTree = "<group>"; };
432432
37F742EA202A382400A47D3A /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
433433
39ACEAE8218A03C6C22DC662 /* Pods-Automattic-Simplenote.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-Simplenote.release.xcconfig"; path = "Target Support Files/Pods-Automattic-Simplenote/Pods-Automattic-Simplenote.release.xcconfig"; sourceTree = "<group>"; };
434+
3F1FC4212C0EBEF10066B187 /* Simplenote.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Simplenote.xctestplan; sourceTree = "<group>"; };
434435
466FFF2F17CC10A800399652 /* Simplenote.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Simplenote.app; sourceTree = BUILT_PRODUCTS_DIR; };
435436
469512CB17CD23100014A2BF /* Simplenote-Info-Hockey.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Simplenote-Info-Hockey.plist"; sourceTree = "<group>"; };
436437
46A0BEB8175BFD540050E864 /* Simplenote.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Simplenote.entitlements; sourceTree = SOURCE_ROOT; };
@@ -1498,6 +1499,7 @@
14981499
B5CBB06A241976230003C271 /* SimplenoteTests */ = {
14991500
isa = PBXGroup;
15001501
children = (
1502+
3F1FC4212C0EBEF10066B187 /* Simplenote.xctestplan */,
15011503
B53FF5482476F94B0014E928 /* Helpers */,
15021504
B5EF32AF258D07420069EC7D /* Controllers */,
15031505
B5985AD3242949C30044EDE9 /* Converters */,
@@ -2452,8 +2454,7 @@
24522454
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta";
24532455
CLANG_ENABLE_MODULES = YES;
24542456
CODE_SIGN_ENTITLEMENTS = Simplenote/SimplenoteDebug.entitlements;
2455-
CODE_SIGN_IDENTITY = "Mac Developer";
2456-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
2457+
CODE_SIGN_IDENTITY = "Apple Development";
24572458
CODE_SIGN_STYLE = Manual;
24582459
COMBINE_HIDPI_IMAGES = YES;
24592460
DEAD_CODE_STRIPPING = YES;
@@ -2509,7 +2510,6 @@
25092510
CLANG_ENABLE_MODULES = YES;
25102511
CODE_SIGN_ENTITLEMENTS = Simplenote.entitlements;
25112512
CODE_SIGN_IDENTITY = "Apple Distribution";
2512-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
25132513
CODE_SIGN_STYLE = Manual;
25142514
COMBINE_HIDPI_IMAGES = YES;
25152515
DEAD_CODE_STRIPPING = YES;
@@ -2587,7 +2587,6 @@
25872587
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
25882588
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
25892589
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
2590-
CODE_SIGN_IDENTITY = "Apple Development";
25912590
CODE_SIGN_STYLE = Manual;
25922591
COMBINE_HIDPI_IMAGES = YES;
25932592
DEAD_CODE_STRIPPING = YES;
@@ -2632,7 +2631,6 @@
26322631
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
26332632
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
26342633
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
2635-
CODE_SIGN_IDENTITY = "Apple Development";
26362634
CODE_SIGN_STYLE = Manual;
26372635
COMBINE_HIDPI_IMAGES = YES;
26382636
COPY_PHASE_STRIP = NO;
@@ -2675,8 +2673,7 @@
26752673
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
26762674
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
26772675
CODE_SIGN_ENTITLEMENTS = "IntentsExtension/Support Files/IntentsExtensionDebug.entitlements";
2678-
CODE_SIGN_IDENTITY = "Mac Developer";
2679-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
2676+
CODE_SIGN_IDENTITY = "Apple Development";
26802677
CODE_SIGN_STYLE = Manual;
26812678
CURRENT_PROJECT_VERSION = $BUILD_NUMBER;
26822679
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -2731,7 +2728,6 @@
27312728
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
27322729
CODE_SIGN_ENTITLEMENTS = "IntentsExtension/Support Files/IntentsExtension.entitlements";
27332730
CODE_SIGN_IDENTITY = "Apple Distribution";
2734-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
27352731
CODE_SIGN_STYLE = Manual;
27362732
COPY_PHASE_STRIP = NO;
27372733
CURRENT_PROJECT_VERSION = $BUILD_NUMBER;

Simplenote.xcodeproj/xcshareddata/xcschemes/Simplenote.xcscheme

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "1530"
4-
version = "1.3">
4+
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -36,6 +36,12 @@
3636
ReferencedContainer = "container:Simplenote.xcodeproj">
3737
</BuildableReference>
3838
</MacroExpansion>
39+
<TestPlans>
40+
<TestPlanReference
41+
reference = "container:SimplenoteTests/Simplenote.xctestplan"
42+
default = "YES">
43+
</TestPlanReference>
44+
</TestPlans>
3945
<Testables>
4046
<TestableReference
4147
skipped = "NO"

SimplenoteTests/Simplenote.xctestplan

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"configurations" : [
3+
{
4+
"id" : "4B8E5E02-932F-4AEF-8E24-E62BF97BAC99",
5+
"name" : "Configuration 1",
6+
"options" : {
7+
8+
}
9+
}
10+
],
11+
"defaultOptions" : {
12+
"codeCoverage" : false,
13+
"targetForVariableExpansion" : {
14+
"containerPath" : "container:Simplenote.xcodeproj",
15+
"identifier" : "466FFEA617CC10A800399652",
16+
"name" : "Simplenote"
17+
}
18+
},
19+
"testTargets" : [
20+
{
21+
"target" : {
22+
"containerPath" : "container:Simplenote.xcodeproj",
23+
"identifier" : "B5CBB068241976230003C271",
24+
"name" : "SimplenoteTests"
25+
}
26+
}
27+
],
28+
"version" : 1
29+
}

0 commit comments

Comments
 (0)