Git Merge Request #74: [#8032] Default email id's created and confirmed, tests passed. (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Pranav Sharma wants to merge 0 commits from /u/pranav/allura/ to master, 2016-02-05

Determining commits...

Discussion

  • Dave Brondsema

    Dave Brondsema - 2016-01-20

    Nice job fixing those tests. I am seeing another one fail now, actually it fails sometimes but not other times, if you run it many times.

    nosetests allura.tests.functional.test_auth:TestPasswordReset.test_password_reset
    
    FAIL: allura.tests.functional.test_auth:TestPasswordReset.test_password_reset
      vi +1339 Allura/allura/tests/functional/test_auth.py  # test_password_reset
        '_session_id': self.app.cookies['_session_id'],
      vi +24   /usr/local/Cellar/python/2.7.10_2/Frameworks/Python.framework/Versions/2.7/lib/python2.7/contextlib.py  # __exit__
        self.gen.next()
      vi +175  Allura/allura/tests/decorators.py  # audits
        message=re.compile(preamble + message))).count(), 'Could not find "%s"' % message
    AssertionError: Could not find "Password recovery link sent to: test-admin@users.localhost"
    

    Also, as you can see in the list of commits on this page, its not showing just your commits. Can you rebase (e.g. git rebase -i origin/master) your branch? That should clean it up. Thanks

     
  • Dave Brondsema

    Dave Brondsema - 2016-02-05
    • Status: open --> rejected
     

Log in to post a comment.