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

WIP: Switch default Debian branch to 'debian/latest' (Closes: #829444) #93

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

ottok
Copy link
Contributor

@ottok ottok commented Jan 5, 2024

As defined by DEP14, the default Debian packaging branch name should be 'debian/latest' instead of 'master.

https://dep-team.pages.debian.net/deps/dep14/

Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829444

@ottok
Copy link
Contributor Author

ottok commented Jan 5, 2024

@ottok
Copy link
Contributor Author

ottok commented Jan 12, 2024

I understand the tests and the git/repository.py class enough so that I got all tests passing at https://salsa.debian.org/otto/git-buildpackage/-/jobs/5147497 (however CI fails on packaging step on seemingly unrelated issue). As a side effect of testing running tests in isolated container locally I also wrote #95.

However, this is far from complete. As discussed in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829444#45 we need to figure out how to detect new repositories and only apply the default new branch name debian/latest on new repositories, along with an extension to the test suite to verify that old repositories will continue to work with zero changes.

ottok and others added 7 commits August 25, 2024 17:14
As defined by DEP14, the default Debian packaging branch name should be
'debian/latest' instead of 'master.

https://dep-team.pages.debian.net/deps/dep14/
======================================================================
FAIL: Dump the repository and check if files exist
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/builds/otto/git-buildpackage/debian/output/source_dir/tests/04_test_submodules.py", line 116, in test_dump_tree
    ok_(buildpackage.dump_tree(REPO, dumpdir, "debian/latest", True))
AssertionError: None
-------------------- >> begin captured logging << --------------------
gbp: error: Error in dump_tree archive pipe
--------------------- >> end captured logging << ---------------------

======================================================================
FAIL: test_30_quilt (tests.24_test_gbp_import_orig.TestIs30Quilt.test_30_quilt)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builds/otto/git-buildpackage/debian/output/source_dir/tests/24_test_gbp_import_orig.py", line 55, in test_30_quilt
    self.assertEquals(self.repo.branch, options.debian_branch)
AssertionError: 'master' != 'debian/latest'
- master
+ debian/latest


======================================================================
FAIL: Make sure we shorten the reflog entry properly
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builds/otto/git-buildpackage/debian/output/source_dir/tests/28_test_gbp_git_repository_commit_dir.py", line 41, in test_long_msg_854333
    self.assertEquals(ret, 0)
AssertionError: 128 != 0
…tRepo'"

This reverts commit 2fef23b0bde35d2896d955c4a0e7dd865474a4b3.
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.

1 participant