[Notes] [Git][BuildStream/buildstream][master] 2 commits: tests/integration/cachedfail.py: Fix test_push_cached_fail

[Jürg Billeter <gitlab mg gitlab com>]

Title: GitLab

Jürg Billeter pushed to branch master at BuildStream / buildstream

Commits:

• 670ac479
  by Jürg Billeter at 2019-02-20T06:55:14Z

  tests/integration/cachedfail.py: Fix test_push_cached_fail
  
  Ensure that a unique cache key is used for different test variants. This
  revealed that the test actually fails with --on-error=quit. Marking that
  test variant as expected failure until this is fixed.
  
  https://gitlab.com/BuildStream/buildstream/issues/534
  

• cf01c3bf
  by Jürg Billeter at 2019-02-20T08:00:16Z

  Merge branch 'juerg/cachedfail' into 'master'
  
  tests/integration/cachedfail.py: Fix test_push_cached_fail
  
  See merge request BuildStream/buildstream!1167

1 changed file:

• tests/integration/cachedfail.py

Changes:

tests/integration/cachedfail.py

---

...	...	@@ -127,10 +127,11 @@ def test_build_depend_on_cached_fail(cli, tmpdir, datafiles):
127	127	@pytest.mark.datafiles(DATA_DIR)
128	128	@pytest.mark.parametrize("on_error", ("continue", "quit"))
129	129	def test_push_cached_fail(cli, tmpdir, datafiles, on_error):
	130	+ if on_error == 'quit':
	131	+ pytest.xfail('https://gitlab.com/BuildStream/buildstream/issues/534')
	132	+
130	133	project = os.path.join(datafiles.dirname, datafiles.basename)
131	134	element_path = os.path.join(project, 'elements', 'element.bst')
132		- workspace = os.path.join(cli.directory, 'workspace')
133		- checkout = os.path.join(cli.directory, 'checkout')
134	135
135	136	# Write out our test target
136	137	element = {
...	...	@@ -144,6 +145,8 @@ def test_push_cached_fail(cli, tmpdir, datafiles, on_error):
144	145	'config': {
145	146	'commands': [
146	147	'false',
	148	+ # Ensure unique cache key for different test variants
	149	+ 'TEST="{}"'.format(os.environ.get('PYTEST_CURRENT_TEST')),
147	150	],
148	151	},
149	152	}

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