Git Merge Request #386: New approach implementation in repo_refresh.py (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Vrinda A wants to merge 11 commits from /u/vrinda/allura/ to master, 2022-03-25

Reverted earlier changes made in the files artifact.py, index_tasks.py & tracker_main.py.
Added test case for unsubscribing users after removing from admin group.

Commit Date  
[bf1b4a] (HEAD, master) by Vrinda A Vrinda A

[#5593] Create backlink from ticket when commit message contains ticket link

 2022-02-25 12:07:32 Tree
[f3a6a3] by Vrinda A Vrinda A

[#8391] Unsubscribe from a project when a user is removed from Admin group - added a test case

 2022-02-25 11:42:53 Tree
[14263d] by Vrinda A Vrinda A

[#5593] Create backlink from ticket when commit message contains ticket link

 2021-12-01 13:53:58 Tree
[7630ac] by Vrinda A Vrinda A

[#8391] Unsubscribe from a project when a user is removed from Admin group

 2021-12-01 13:52:54 Tree
[e89bf0] by Vrinda A Vrinda A

Updated requirements.txt with profanityfilter

 2019-10-15 09:37:00 Tree
[f2c0ff] by root root

Revert "Feedback app"

This reverts commit 8d1d8734c31eac2c8257d75a592dbb5a99e3ceef.

 2019-10-10 11:29:37 Tree
[8d1d87] by Vrinda A Vrinda A , pushed by root root

Feedback app

 2019-09-26 04:55:06 Tree
[73c517] by Vrinda A Vrinda A , pushed by root root

Feedback app

 2019-09-26 04:53:16 Tree
[cad898] by root root

Feedback app

 2019-09-25 17:26:19 Tree
[877e48] by root root

Added rating field

 2019-09-25 17:14:22 Tree
[9b9776] by Vrinda A Vrinda A

[FEATURE] Added ForgeFeedback app

- This app will let the user rate and review a project.

 2019-09-25 17:14:22 Tree

Discussion

  • Dave Brondsema

    Dave Brondsema - 2022-03-08

    I've merged the commits regarding unsubscribing admins when they are removed. I made an update to the test so that it exercises the delete_user function where the code changes actually were. You can see that at [687449]

    Next time it'd be nicer to have a merge request that is rebased to have just the new changes, this is branched off way back to the Feedback app 😄 But its ok for now, I can cherry-pick and rebase it ok myself.

    Review of the backlink work coming next.

     

  • Dave Brondsema

    Dave Brondsema - 2022-03-22

    Sorry for more delays, I'm starting to get back to this now though. I ran the test suite and got this error:

    ======================================================================
ERROR: test_refresh (forgesvn.tests.model.test_repository.TestRepo)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/src/allura/ForgeSVN/forgesvn/tests/model/test_repository.py", line 819, in test_refresh
    self.repo.refresh()
  File "/src/allura/Allura/allura/model/repository.py", line 726, in refresh
    refresh_repo(self, all_commits, notify, new_clone, commits_are_new)
  File "/src/allura/Allura/allura/model/repo_refresh.py", line 71, in refresh_repo
    refresh_commit_repos(all_commit_ids, repo)
  File "/src/allura/Allura/allura/model/repo_refresh.py", line 175, in refresh_commit_repos
    update_artifact_refs(ci, ref, project_id)
  File "/src/allura/Allura/allura/model/repo_refresh.py", line 129, in update_artifact_refs
    shortlinks = find_shortlinks(commit.message)
  File "/src/allura/Allura/allura/lib/search.py", line 376, in find_shortlinks
    md.convert(text)
  File "/var/local/env-allura/lib/python3.7/site-packages/markdown/core.py", line 248, in convert
    if not source.strip():
AttributeError: 'NoneType' object has no attribute 'strip'

    Maybe the new code needs to check commit.message before using it?

    ForgeSVN can be a bit tricky to work, since it needs pysvn. I probably can work on fixing this test, but I wanted to mention it and give a status update.

    Also this shows there is at least one test, probably more that run through this refresh code. So it'd be good to extend one of them (or write a new one) that asserts new artifact references have been created.

     

  • Dave Brondsema

    Dave Brondsema - 2022-03-25

    I've fixed that issue, and done a little cleanup and added a test. You can see all that at [6b8d4c]

     

  • Dave Brondsema

    Dave Brondsema - 2022-03-25
    • Status: open --> merged
     

Log in to post a comment.