diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-04-02 07:52:10 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-04-02 08:06:23 +0200 |
| commit | 12b86f180d0eb4381ca854f40cc543ca7e0076b1 (patch) | |
| tree | 98dc9b023c8d02c06c53917d7d4c06002818d06b /tests/format | |
| parent | 8b6cc681bf1fd0857f2155c160607faaff5eda98 (diff) | |
| download | buildstream-12b86f180d0eb4381ca854f40cc543ca7e0076b1.tar.gz | |
tests/format/junctions.py: Drop Python 3.5 compatibility
Diffstat (limited to 'tests/format')
| -rw-r--r-- | tests/format/junctions.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/format/junctions.py b/tests/format/junctions.py index 581e7442f..70572ee3e 100644 --- a/tests/format/junctions.py +++ b/tests/format/junctions.py @@ -56,8 +56,7 @@ def test_junction_missing_project_conf(cli, datafiles): # TODO: see if datafiles can tidy this concat up - # py3.5 requires this str conversion. - os.remove(str(project / "base" / "project.conf")) + os.remove(project / "base" / "project.conf") # Note that both 'foo' and 'base' projects have a 'target.bst'. The # 'app.bst' in 'foo' depends on the 'target.bst' in 'base', i.e.: @@ -94,8 +93,7 @@ def test_workspaced_junction_missing_project_conf(cli, datafiles): print(result) result.assert_success() - # py3.5 requires this str conversion. - os.remove(str(workspace_dir / "project.conf")) + os.remove(workspace_dir / "project.conf") result = cli.run(project=project, args=["build", "app.bst"]) result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_JUNCTION) @@ -360,8 +358,7 @@ def test_git_missing_project_conf(cli, tmpdir, datafiles): project = datafiles / "foo" # See test_junction_missing_project_conf for some more background. - # py3.5 requires this str conversion. - os.remove(str(datafiles / "base" / "project.conf")) + os.remove(datafiles / "base" / "project.conf") # Create the repo from 'base' subdir repo = create_repo("git", str(tmpdir)) |