Skip to content
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.

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

[xcode16] Misc fixes after running tests on macOS Sequoia. #21193

Merged
merged 4 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions src/fskit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,6 @@ interface FSItemAttributes : INSSecureCoding
[Export ("parentID")]
ulong ParentId { get; set; }

// KOIO = Kernel Offloaded IO
[Export ("useKOIO")]
bool UseKoio { get; set; }

[Export ("supportsLimitedXAttrs")]
bool SupportsLimitedXAttrs { get; set; }

Expand Down
1 change: 0 additions & 1 deletion tests/cecil-tests/Documentation.KnownFailures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67001,7 +67001,6 @@ P:FSKit.FSItemAttributes.Size
P:FSKit.FSItemAttributes.SupportsLimitedXAttrs
P:FSKit.FSItemAttributes.Type
P:FSKit.FSItemAttributes.Uid
P:FSKit.FSItemAttributes.UseKoio
P:FSKit.FSItemGetAttributesRequest.WantedAttributes
P:FSKit.FSItemSetAttributesRequest.ConsumedAttributes
P:FSKit.FSKitConstants.FSKitVersionNumber
Expand Down
5 changes: 5 additions & 0 deletions tests/introspection/ApiCtorInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ protected virtual bool Skip (Type type)
case "GKHybridStrategist":
return true; // GKHybridStrategist has been removed from our bindings
#endif
case "THClient":
// The default initializer is documented to work, but it takes a long time before it eventually fails on macOS Sequoia
// Looking at the stack trace in Xcode, it seems it hits the network and times out waiting for something?
// So just skip the testing, it's likely the constructor is bound correctly, but that it only works in some circumstances.
return true;
}

switch (type.Namespace) {
Expand Down
13 changes: 13 additions & 0 deletions tests/introspection/ApiProtocolTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ protected virtual bool Skip (Type type, string protocolName)
case "ASDiscoveryDescriptor":
case "ASMigrationDisplayItem":
case "ASPickerDisplayItem":
case "DDDevice":
case "PKAddCarKeyPassConfiguration":
case "PKAddSecureElementPassConfiguration":
case "PKAddShareablePassConfiguration":
Expand Down Expand Up @@ -401,6 +402,11 @@ protected virtual bool Skip (Type type, string protocolName)
case "ASAuthorizationPublicKeyCredentialLargeBlobAssertionInput":
case "ASAuthorizationPublicKeyCredentialLargeBlobAssertionOutput":
case "ASAuthorizationPublicKeyCredentialLargeBlobRegistrationInput":
case "DDDevice":
case "DDDeviceEvent":
case "FSMessageConnection":
case "FSModuleIdentity":
case "NSFileProviderKnownFolderLocations":
case "UIGestureRecognizer":
case "UIRotationGestureRecognizer":
case "UILongPressGestureRecognizer":
Expand Down Expand Up @@ -601,6 +607,11 @@ protected virtual bool Skip (Type type, string protocolName)
case "ASAuthorizationPublicKeyCredentialLargeBlobAssertionInput":
case "ASAuthorizationPublicKeyCredentialLargeBlobAssertionOutput":
case "ASAuthorizationPublicKeyCredentialLargeBlobRegistrationInput":
case "DDDevice":
case "DDDeviceEvent":
case "FSMessageConnection":
case "FSModuleIdentity":
case "NSFileProviderKnownFolderLocations":
case "UIGestureRecognizer":
case "UIRotationGestureRecognizer":
case "UILongPressGestureRecognizer":
Expand All @@ -614,6 +625,8 @@ protected virtual bool Skip (Type type, string protocolName)
case "NSLocalizedNumberFormatRule":
// Foundation.MonoTouchException : Objective-C exception thrown. Name: NSInvalidArgumentException Reason: *** -supportsSecureCoding cannot be sent to an abstract object of class NSLocalizedNumberFormatRule: Create a concrete instance!
return true;
case "FSResource": // header says yes, runtime says no
return true;
}
break;
// conformance added in Xcode 8 (iOS 10 / macOS 10.12)
Expand Down
6 changes: 6 additions & 0 deletions tests/introspection/ApiSelectorTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,12 @@ protected virtual bool SkipInit (string selector, MethodBase m)
case "initWithAchievementID:":
case "initWithLeaderboardSetID:":
return true;
case "initWithBytes:length:":
switch (m.DeclaringType.Name) {
case "FSFileName":
return true;
}
return false;
default:
return false;
}
Expand Down
2 changes: 0 additions & 2 deletions tests/introspection/iOS/iOSApiCtorInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,6 @@ protected override bool Skip (Type type)
return TestRuntime.CheckXcodeVersion (11, 2);
case "UIMenuController": // Stopped working with Xcode 11.3 beta 1
return TestRuntime.CheckXcodeVersion (11, 3);
case "THClient":
return TestRuntime.IsSimulatorOrDesktop;
#if __TVOS__
case "MPSPredicate":
// the device .ctor ends up calling `initWithBuffer:offset:` and crash on older (non 4k AppleTV devices)
Expand Down
2 changes: 2 additions & 0 deletions tests/monotouch-test/AudioToolbox/AudioComponentTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ public void TestConfigurationInfo ()
}

[Test]
[Ignore ("This test times out randomly")]
public void TestValidation ()
{
TestRuntime.AssertXcodeVersion (14, 0);
Expand Down Expand Up @@ -183,6 +184,7 @@ public void TestValidation ()
}

[Test]
[Ignore ("This test times out randomly")]
public void TestValidationAsync ()
{
TestRuntime.AssertXcodeVersion (14, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void AvailableCompanionTypes ()
Assert.IsNotNull (context.DomainState, "DomainState");
Assert.IsNotNull (context.DomainState.Companion, "DomainState.Companion");
Assert.IsNotNull (context.DomainState.Companion.WeakAvailableCompanionTypes, "DomainState.Companion.WeakAvailableCompanionTypes");
Assert.AreEqual (LACompanionType.None, context.DomainState.Companion.AvailableCompanionTypes, "DomainState.Companion.AvailableCompanionTypes");
Assert.That (context.DomainState.Companion.AvailableCompanionTypes, Is.EqualTo (LACompanionType.None).Or.EqualTo (LACompanionType.Watch), "DomainState.Companion.AvailableCompanionTypes");
}
}
}
Expand Down
6 changes: 1 addition & 5 deletions tests/monotouch-test/Security/ImportExportTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,7 @@ public void P12_AuthFailed ()
using (NSMutableDictionary options = new NSMutableDictionary ()) {
options [SecImportExport.Passphrase] = new NSString ("b5");
NSDictionary [] array;
#if MONOMAC
Assert.That (SecImportExport.ImportPkcs12 (farscape_pfx, options, out array), Is.EqualTo (SecStatusCode.Pkcs12VerifyFailure), "AuthFailed");
#else
Assert.That (SecImportExport.ImportPkcs12 (farscape_pfx, options, out array), Is.EqualTo (SecStatusCode.AuthFailed), "AuthFailed");
#endif
Assert.That (SecImportExport.ImportPkcs12 (farscape_pfx, options, out array), Is.EqualTo (SecStatusCode.AuthFailed).Or.EqualTo (SecStatusCode.Pkcs12VerifyFailure), "AuthFailed");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public void CtorIPAddressPair ()
NetworkReachabilityFlags flags;

Assert.IsTrue (nr.TryGetFlags (out flags), "#2");
flags &= ~NetworkReachabilityFlags.TransientConnection; // Remove the TransientConnection flag if it's set
Assert.That (flags, Is.EqualTo (NetworkReachabilityFlags.Reachable), "#2 Reachable");
}

Expand All @@ -107,7 +108,7 @@ public void CtorIPAddressPair ()
void CheckLoopbackFlags (NetworkReachabilityFlags flags, string number, bool has_address)
{
var noFlags = (NetworkReachabilityFlags) 0;
var otherFlags = (flags & ~(NetworkReachabilityFlags.Reachable | NetworkReachabilityFlags.IsLocalAddress | NetworkReachabilityFlags.IsDirect));
var otherFlags = (flags & ~(NetworkReachabilityFlags.Reachable | NetworkReachabilityFlags.IsLocalAddress | NetworkReachabilityFlags.IsDirect | NetworkReachabilityFlags.TransientConnection));

// Different versions of OSes report different flags. Trying to
// figure out which OS versions have which flags set turned out to
Expand Down