[Notes] [Git][BuildStream/buildstream][richardmaw/oldgit-shallow-parents-exclude-fix] tests/sources/git.py: Handle old git not supporting --first-parent

[richardmaw-codethink <gitlab mg gitlab com>]

Title: GitLab

richardmaw-codethink pushed to branch richardmaw/oldgit-shallow-parents-exclude-fix at BuildStream / buildstream

Commits:

• 8e5bf2c9
  by Richard Maw at 2019-01-14T16:26:13Z

  tests/sources/git.py: Handle old git not supporting --first-parent
  
  If we don't have `--first-parent` then we won't get tag1.
  
  Not having `--first-parent` is not treated as an error by the source plugin,
  and instead results in a different cache key,
  so this is assumed to be intended behaviour.
  

1 changed file:

• tests/sources/git.py

Changes:

tests/sources/git.py

---

...	...	@@ -869,14 +869,17 @@ def test_git_describe(cli, tmpdir, datafiles, ref_storage, tag_type):
869	869	cwd=checkout).decode('ascii')
870	870	assert describe.startswith('tag2-2-')
871	871
872		- describe_fp = subprocess.check_output(['git', 'describe', '--first-parent'] + options,
873		- cwd=checkout).decode('ascii')
874		- assert describe_fp.startswith('tag1-2-')
	872	+ p = subprocess.run(['git', 'describe', '--first-parent'] + options,
	873	+ cwd=checkout, stdout=subprocess.PIPE)
	874	+ has_first_parent = p.returncode == 0
	875	+ if has_first_parent:
	876	+ describe_fp = p.stdout.decode('ascii')
	877	+ assert describe_fp.startswith('tag1-2-')
875	878
876	879	tags = subprocess.check_output(['git', 'tag'],
877	880	cwd=checkout).decode('ascii')
878	881	tags = set(tags.splitlines())
879		- assert tags == set(['tag1', 'tag2'])
	882	+ assert tags == set(['tag1', 'tag2']) if has_first_parent else set(['tag2'])
880	883
881	884	p = subprocess.run(['git', 'log', repo.rev_parse('uselesstag')],
882	885	cwd=checkout)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.