Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream
Commits:
-
174eedd6
by Phillip Smyth at 2018-09-24T14:17:28Z
2 changed files:
Changes:
| ... | ... | @@ -93,9 +93,10 @@ def test_close_cross_junction(cli, tmpdir): |
| 93 | 93 |
result.assert_success()
|
| 94 | 94 |
|
| 95 | 95 |
loaded = _yaml.load_data(result.output)
|
| 96 |
- assert isinstance(loaded.get('workspaces'), list)
|
|
| 97 |
- workspaces = loaded['workspaces']
|
|
| 98 |
- assert len(workspaces) == 0
|
|
| 96 |
+ if not loaded['workspaces'] == "No workspaces found":
|
|
| 97 |
+ assert isinstance(loaded.get('workspaces'), list)
|
|
| 98 |
+ workspaces = loaded['workspaces']
|
|
| 99 |
+ assert len(workspaces) == 0
|
|
| 99 | 100 |
|
| 100 | 101 |
|
| 101 | 102 |
def test_close_all_cross_junction(cli, tmpdir):
|
| ... | ... | @@ -112,6 +113,7 @@ def test_close_all_cross_junction(cli, tmpdir): |
| 112 | 113 |
result.assert_success()
|
| 113 | 114 |
|
| 114 | 115 |
loaded = _yaml.load_data(result.output)
|
| 115 |
- assert isinstance(loaded.get('workspaces'), list)
|
|
| 116 |
- workspaces = loaded['workspaces']
|
|
| 117 |
- assert len(workspaces) == 0
|
|
| 116 |
+ if not loaded['workspaces'] == "No workspaces found":
|
|
| 117 |
+ assert isinstance(loaded.get('workspaces'), list)
|
|
| 118 |
+ workspaces = loaded['workspaces']
|
|
| 119 |
+ assert len(workspaces) == 0
|
| ... | ... | @@ -178,7 +178,7 @@ class Result(): |
| 178 | 178 |
return list(pushed)
|
| 179 | 179 |
|
| 180 | 180 |
def get_pulled_elements(self):
|
| 181 |
- pulled = re.findall(r'\[\s*pull:(\S+)\s*\]\s*INFO\s*Pulled artifact', self.stderr)
|
|
| 181 |
+ pulled = re.findall(r'\[\s*pull:(\S+)\s*\]\s*INFO\s*Downloaded artifact', self.stderr)
|
|
| 182 | 182 |
if pulled is None:
|
| 183 | 183 |
return []
|
| 184 | 184 |
|