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

Update ROS testing dependency, reenable tests #5332

Merged
merged 3 commits into from
Sep 23, 2017

Conversation

austinzheng
Copy link
Contributor

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

I stole some of @bdash's fixes from #5326.

@@ -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"
Copy link
Contributor

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?

Copy link
Contributor Author

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...

Copy link
Contributor

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.

Copy link
Contributor Author

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.

@austinzheng austinzheng force-pushed the az/reenable-admin-token-tests branch from 77d4804 to 14b1b0f Compare September 22, 2017 19:35
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
Copy link
Member

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.

Copy link
Contributor Author

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 }')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why [r]os?

Copy link
Contributor

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.

Copy link
Member

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
@austinzheng austinzheng force-pushed the az/reenable-admin-token-tests branch from 9fc6cf7 to 56588f5 Compare September 22, 2017 22:42
@austinzheng austinzheng merged commit b4e783e into master-3.0 Sep 23, 2017
@austinzheng austinzheng deleted the az/reenable-admin-token-tests branch September 23, 2017 00:11
@austinzheng
Copy link
Contributor Author

I did sh build.sh build locally and checked the Realm, Realm Swift, and object server test suites in Xcode.

tgoyne added a commit that referenced this pull request Sep 23, 2017
* 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.
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants