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

Fix tests on canary. They broke when Ember.js removed the meta.descs #2756

Merged
merged 2 commits into from
Feb 8, 2015

Conversation

bmac
Copy link
Member

@bmac bmac commented Feb 5, 2015

@bmac bmac force-pushed the fix-canary-tests branch from 2a35e00 to 7129853 Compare February 5, 2015 13:59
@bmac
Copy link
Member Author

bmac commented Feb 5, 2015

I'm not sure why the relationship integration tests are complaining about "run loop at end of test". They all are green for me locally in both the browser and the command line. I will investigate some more tonight.

@wecc
Copy link
Contributor

wecc commented Feb 5, 2015

This has happened for me locally, running it again usually solves it. No idea why it's happening though. Force push?

@bmac
Copy link
Member Author

bmac commented Feb 5, 2015

I've also hit this sporadic "run loop at end of test" error locally as well. But that doesn't seem to be the issue here as I've re-triggered the build several times and it seems to consistently be failing at the same spot on travis.

@bmac bmac force-pushed the fix-canary-tests branch 15 times, most recently from bd5af31 to 374a58f Compare February 6, 2015 04:51
@igorT
Copy link
Member

igorT commented Feb 6, 2015

cc @stefanpenner

@@ -7,6 +7,10 @@ var hasMany = DS.hasMany;
var belongsTo = DS.belongsTo;
var hash = Ember.RSVP.hash;

function getComputedPropertyDesc(model, key) {
return Ember.meta(model).descs ? Ember.meta(model).descs[key] : model[key];
Copy link
Member

Choose a reason for hiding this comment

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

the check needs to be a bit more specific, as this may grab non descs out of the object aswell.

cc @ebryn I know this is violating a private API, but it is working around some annoying cross version issues and a serious performance hack. The proper solution is a hefty refactor that will happen sometime soon. Hence the triage fix.

Copy link
Member Author

Choose a reason for hiding this comment

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

@stefanpenner what should I test for to be more specific?

Copy link
Member

Choose a reason for hiding this comment

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

@bmac bmac force-pushed the fix-canary-tests branch 9 times, most recently from 7d5b06c to 751566c Compare February 7, 2015 19:17
@bmac bmac force-pushed the fix-canary-tests branch 10 times, most recently from 5a652f3 to 7fa7fde Compare February 7, 2015 20:29
@bmac
Copy link
Member Author

bmac commented Feb 7, 2015

I've spent a few hours on this pr today and Thursday attempting to try down why travis is reporting a "run loop at end of test" in canary and I haven't made much progress. If any one has any theories or insight I'm all ears.

@bmac
Copy link
Member Author

bmac commented Feb 8, 2015

Cleared the cache on travis and now everything is green.

@@ -7,6 +7,15 @@ var hasMany = DS.hasMany;
var belongsTo = DS.belongsTo;
var hash = Ember.RSVP.hash;

function getComputedPropertyDesc(model, key) {
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a comment here why we need to do this.

@bmac bmac force-pushed the fix-canary-tests branch from e7ff15a to 54286d5 Compare February 8, 2015 03:29
igorT added a commit that referenced this pull request Feb 8, 2015
Fix tests on canary. They broke when Ember.js removed the meta.descs
@igorT igorT merged commit 2c4a735 into emberjs:master Feb 8, 2015
@bmac bmac deleted the fix-canary-tests branch February 8, 2015 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants