[Notes] [Git][BuildStream/buildstream][master] 3 commits: Incorrect error when malformed project.conf

[Phillip Smyth <gitlab mg gitlab com>]

Title: GitLab

Phillip Smyth pushed to branch master at BuildStream / buildstream

Commits:

• ba4da3a4
  by knownexus at 2018-09-18T16:45:09Z

  Incorrect error when malformed project.conf
  
  bst build returns "missing project.conf" when a project.conf is invalid
  This results in an existing project with malformed yaml being dismissed
  and attempts to make a new project
  
  Added new exception
  

• 89a16e17
  by knownexus at 2018-09-18T16:45:09Z

  Adding test for Invalid Yaml
  

• 72b59021
  by Phillip Smyth at 2018-09-19T08:48:51Z

  Merge branch 'issue-642-Invalid_project.conf_seen_as_missing' into 'master'
  
  Incorrect error when malformed project.conf
  
  Closes #642
  
  See merge request BuildStream/buildstream!792

4 changed files:

• buildstream/_project.py
• tests/format/project.py
• + tests/format/project/invalid-yaml/manual.bst
• + tests/format/project/invalid-yaml/project.conf

Changes:

buildstream/_project.py

---

...	...	@@ -385,7 +385,10 @@ class Project():
385	385	self._project_conf = _yaml.load(projectfile)
386	386	except LoadError as e:
387	387	# Raise a more specific error here
388		- raise LoadError(LoadErrorReason.MISSING_PROJECT_CONF, str(e))
	388	+ if e.reason == LoadErrorReason.MISSING_FILE:
	389	+ raise LoadError(LoadErrorReason.MISSING_PROJECT_CONF, str(e)) from e
	390	+ else:
	391	+ raise
389	392
390	393	pre_config_node = _yaml.node_copy(self._default_config_node)
391	394	_yaml.composite(pre_config_node, self._project_conf)

tests/format/project.py

---

...	...	@@ -40,6 +40,13 @@ def test_invalid_project_name(cli, datafiles):
40	40	result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_SYMBOL_NAME)
41	41
42	42
	43	+@pytest.mark.datafiles(os.path.join(DATA_DIR))
	44	+def test_invalid_yaml(cli, datafiles):
	45	+ project = os.path.join(datafiles.dirname, datafiles.basename, "invalid-yaml")
	46	+ result = cli.run(project=project, args=['workspace', 'list'])
	47	+ result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_YAML)
	48	+
	49	+
43	50	@pytest.mark.datafiles(os.path.join(DATA_DIR))
44	51	def test_load_default_project(cli, datafiles):
45	52	project = os.path.join(datafiles.dirname, datafiles.basename, "default")

tests/format/project/invalid-yaml/manual.bst

---

1

+kind: manual

tests/format/project/invalid-yaml/project.conf

---

	1	+# Basic project configuration that doesnt override anything
	2	+#
	3	+
	4	+name: pony
	5	+
	6	+variables:
	7	+ sbindir: "%{bindir}
	8	+

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