-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Update ROS testing dependency, reenable tests #5332
Conversation
@@ -454,7 +452,10 @@ - (void)disabled_testRetrieveUserInfo { | |||
/// The login queue argument should be respected. | |||
- (void)testLoginQueueForSuccessfulLogin { | |||
// Make global queue | |||
#pragma clang diagnostic push | |||
#pragma clang diagnostic ignored "-Wunguarded-availability" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not switch to using DISPATCH_QUEUE_PRIORITY_DEFAULT
instead of a constant that isn't available on some versions of macOS that this test target builds for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think they're all gated by the same availability check. Let me try it...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so… the QoS stuff is newer than dispatch itself.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The QOS
constants are new, the DISPATCH_QUEUE_PRIORITY
ones aren't.
77d4804
to
14b1b0f
Compare
build.sh
Outdated
rm -rf "~/Library/Application Support/xctest" | ||
rm -rf "~/Library/Application Support/io.realm.TestHost" | ||
rm -rf "~/Library/Application Support/xctest-child" | ||
rm -rf ~/Library/Application Support/xctest |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This deletes the files ~/Library/Application
and Support/xctest
, and -f makes it not complain about that neither of these exist. The space needs to be escaped.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for catching this!
build.sh
Outdated
@@ -315,7 +315,7 @@ fi | |||
|
|||
kill_object_server() { | |||
# Based on build.sh conventions we always run ROS from a path ending in 'ros/bin/ros'. | |||
pid=$(ps ax | grep "ros/bin/ros start$" | sed -e 's/^[[:space:]]*//' | awk '{ print $1 }') | |||
pid=$(ps ax | grep "[r]os/bin/ros start" | sed -e 's/^[[:space:]]*//' | awk '{ print $1 }') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why [r]os
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It prevents the grep
from matching itself in the ps
output.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we don't need to support non-BSD platforms this can just be pkill -f ros/bin/ros start
.
Changes: - Updated ROS to alpha-36 - Fixed admin token parsing and re-enabled admin token tests - Suppressed some spurious warnings for the object store test target - Don't double-quote paths containing `~` in build.sh
9fc6cf7
to
56588f5
Compare
I did |
* origin/master-3.0: Update ROS testing dependency, reenable tests (#5332) Update a test case now that a more precise error is being raised. Fix changelog Have +schemaVersionAtURL: do a better job of translating any exceptions that are thrown. Add a change log entry. Satisfy SwiftLint. Add Swift support. Add a test of offline client reset. Handle incompatible synced Realm exceptions.
Changes:
~
in build.shI stole some of @bdash's fixes from #5326.