Small fixes (split out of #79)

[andrewshadura]

These are small fixes I originally proposed in #79, but which don’t have anything to do with the rest of the pull request, so I’ve split them out so that they can be merged independently.

[agx]

Looks good but beaks some of the tests due to changed strings:

======================================================================
FAIL: Test that we're failing if pristine-tar commit is missing
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/var/scratch/src/git-buildpackage/git-buildpackage/tests/component/deb/test_export_orig.py", line 115, in test_pristine_tar_commit_non_existent
    self._check_log(-1, "gbp:error: Can not find pristine tar commit for archive 'hello-debhelper_2.8.orig.tar.gz'")
  File "/var/scratch/src/git-buildpackage/git-buildpackage/tests/testutils/gbplogtester.py", line 77, in _check_log
    ok_(re.match(regex, output),
AssertionError: Log entry 'gbp:error: Cannot find pristine tar commit for archive 'hello-debhelper_2.8.orig.tar.gz'' doesn't match 'gbp:error: Can not find pristine tar commit for archive 'hello-debhelper_2.8.orig.tar.gz''

[andrewshadura]

Ack, will update.

[andrewshadura]

Not entirely related, but I attempted to set up GitLab CI for my fork, and ran into this (https://gitlab.com/andrewsh/git-buildpackage/-/jobs/1898436128#L731):

======================================================================
FAIL: Check that in case of failure we push all other branches/tags
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builds/andrewsh/git-buildpackage/tests/component/deb/fixtures.py", line 68, in _quilt30_repo
    return fn(*args, repo=repo)
  File "/builds/andrewsh/git-buildpackage/tests/component/deb/test_push.py", line 147, in test_push_failure
    self._check_repo_state(self.target, 'master',
  File "/builds/andrewsh/git-buildpackage/tests/component/__init__.py", line 187, in _check_repo_state
    eq_(branch, current_branch)
AssertionError: None != 'master'

That’s on the master branch. Is my CI misconfigured or is there a hidden bug?

[agx]

I've not seen that one so far. I've applied the patches from that series that pass the tests btw.

[agx]

For reference: pipeline here passes too

[andrewshadura]

Could it be that Git’s behaviour has changed? I can reproduce it every time when I run the command manually:

$ git push --verbose --no-tags origin refs/heads/master:refs/heads/master
Pushing to /srv/gbp_TestPush_x1_2x4gl/tmp_test_push_failure_gpjsq_0x/target
Enumerating objects: 295, done.
Counting objects: 100% (295/295), done.
Delta compression using up to 8 threads
Compressing objects: 100% (291/291), done.
Writing objects: 100% (295/295), 741.93 KiB | 3.53 MiB/s, done.
Total 295 (delta 99), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (99/99), done.
remote: fatal: bad object refs/tags/debian/2.8-1
fatal: bad object refs/tags/debian/2.8-1
To /srv/gbp_TestPush_x1_2x4gl/tmp_test_push_failure_gpjsq_0x/target
 ! [remote rejected] master -> master (missing necessary objects)
error: failed to push some refs to '/srv/gbp_TestPush_x1_2x4gl/tmp_test_push_failure_gpjsq_0x/target'

[agx]

Looks like a regression in 2.34.1, it passes with 2.33.0

[agx]

Fixed via 63ce4ed

[andrewshadura]

Thanks for merging most of the commits 🙂 There’s still one left, tests seem to pass now: https://gitlab.com/andrewsh/git-buildpackage/-/jobs/2087750529

[agx]

Thanks @andrewshadura - tests pass here as well now for that one. Merged!