[Notes] [Git][BuildStream/buildstream][master] 2 commits: testutils/site.py: Support parsing more exotic git versions

[Chandan Singh <gitlab mg gitlab com>]

Title: GitLab

Chandan Singh pushed to branch master at BuildStream / buildstream

Commits:

• dd791373
  by Chandan Singh at 2019-01-31T14:32:44Z

  testutils/site.py: Support parsing more exotic git versions
  
  We use output of `git --version` to determine if we can run some tests
  that rely on features from newer git versions. Usually, we expect the
  output to be like:
  
      git version 2.17.2
  
  On some platforms, like MacOS, there could be a suffix after the version
  string, so that it looks something like:
  
      git version 2.17.2 (Apple Git-113)
  
  This causes things to fail like so:
  
      ValueError: invalid literal for int() with base 10: '2 (Apple Git-113)\n'
  
  Fix logic around `HAVE_OLD_GIT` such that we split the output of
  `git --version` without limit on how many times we split. Previously we
  used to split only twice so the suffixes like `(Apple Git-113)` are not
  part of the parsed version.
  

• 96c0fbd6
  by Chandan Singh at 2019-01-31T15:39:19Z

  Merge branch 'chandan/fix-git-version-mac' into 'master'
  
  testutils/site.py: Support parsing more exotic git versions
  
  See merge request BuildStream/buildstream!1118

1 changed file:

• tests/testutils/site.py

Changes:

tests/testutils/site.py

---

...	...	@@ -18,7 +18,7 @@ try:
18	18	utils.get_host_tool('git')
19	19	HAVE_GIT = True
20	20	out = str(subprocess.check_output(['git', '--version']), "utf-8")
21		- version = tuple(int(x) for x in out.split(' ', 2)[2].split('.'))
	21	+ version = tuple(int(x) for x in out.split(' ')[2].split('.'))
22	22	HAVE_OLD_GIT = version < (1, 8, 5)
23	23	except ProgramNotFoundError:
24	24	HAVE_GIT = False

—
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.