GNOME.org
 

[Notes] [Git][BuildStream/buildstream][willsalmon/defaultWorkspaces] fixup: intergration tests api update

Title: GitLab

Will Salmon pushed to branch willsalmon/defaultWorkspaces at BuildStream / buildstream

Commits:

5 changed files:

Changes:

  • tests/frontend/buildcheckout.py
    ... ... @@ -510,7 +510,7 @@ def test_build_checkout_workspaced_junction(cli, tmpdir, datafiles):
    510 510
    511 511 
         # Now open a workspace on the junction
    512 512 
         #
    513 
    -    result = cli.run(project=project, args=['workspace', 'open', 'junction.bst', workspace])
    513 
    +    result = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, 'junction.bst'])
    514 514 
         result.assert_success()
    515 515 
         filename = os.path.join(workspace, 'files', 'etc-files', 'etc', 'animal.conf')
    516 516

  • tests/frontend/cross_junction_workspace.py
    ... ... @@ -47,7 +47,7 @@ def open_cross_junction(cli, tmpdir):
    47 47 
         workspace = tmpdir.join("workspace")
    48 48
    49 49 
         element = 'sub.bst:data.bst'
    50 
    -    args = ['workspace', 'open', element, str(workspace)]
    50 
    +    args = ['workspace', 'open', '--directory', str(workspace), element]
    51 51 
         result = cli.run(project=project, args=args)
    52 52 
         result.assert_success()
    53 53

  • tests/integration/shell.py
    ... ... @@ -278,7 +278,7 @@ def test_workspace_visible(cli, tmpdir, datafiles):
    278 278
    279 279 
         # Open a workspace on our build failing element
    280 280 
         #
    281 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    281 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    282 282 
         assert res.exit_code == 0
    283 283
    284 284 
         # Ensure the dependencies of our build failing element are built
    ... ... @@ -312,7 +312,7 @@ def test_sysroot_workspace_visible(cli, tmpdir, datafiles):
    312 312
    313 313 
         # Open a workspace on our build failing element
    314 314 
         #
    315 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    315 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    316 316 
         assert res.exit_code == 0
    317 317
    318 318 
         # Ensure the dependencies of our build failing element are built

  • tests/integration/workspace.py
    ... ... @@ -23,7 +23,7 @@ def test_workspace_mount(cli, tmpdir, datafiles):
    23 23 
         workspace = os.path.join(cli.directory, 'workspace')
    24 24 
         element_name = 'workspace/workspace-mount.bst'
    25 25
    26 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    26 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    27 27 
         assert res.exit_code == 0
    28 28
    29 29 
         res = cli.run(project=project, args=['build', element_name])
    ... ... @@ -39,7 +39,7 @@ def test_workspace_commanddir(cli, tmpdir, datafiles):
    39 39 
         workspace = os.path.join(cli.directory, 'workspace')
    40 40 
         element_name = 'workspace/workspace-commanddir.bst'
    41 41
    42 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    42 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    43 43 
         assert res.exit_code == 0
    44 44
    45 45 
         res = cli.run(project=project, args=['build', element_name])
    ... ... @@ -75,7 +75,7 @@ def test_workspace_updated_dependency(cli, tmpdir, datafiles):
    75 75 
         _yaml.dump(dependency, os.path.join(element_path, dep_name))
    76 76
    77 77 
         # First open the workspace
    78 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    78 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    79 79 
         assert res.exit_code == 0
    80 80
    81 81 
         # We build the workspaced element, so that we have an artifact
    ... ... @@ -130,7 +130,7 @@ def test_workspace_update_dependency_failed(cli, tmpdir, datafiles):
    130 130 
         _yaml.dump(dependency, os.path.join(element_path, dep_name))
    131 131
    132 132 
         # First open the workspace
    133 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    133 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    134 134 
         assert res.exit_code == 0
    135 135
    136 136 
         # We build the workspaced element, so that we have an artifact
    ... ... @@ -205,7 +205,7 @@ def test_updated_dependency_nested(cli, tmpdir, datafiles):
    205 205 
         _yaml.dump(dependency, os.path.join(element_path, dep_name))
    206 206
    207 207 
         # First open the workspace
    208 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    208 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    209 209 
         assert res.exit_code == 0
    210 210
    211 211 
         # We build the workspaced element, so that we have an artifact
    ... ... @@ -258,7 +258,7 @@ def test_incremental_configure_commands_run_only_once(cli, tmpdir, datafiles):
    258 258 
         _yaml.dump(element, os.path.join(element_path, element_name))
    259 259
    260 260 
         # We open a workspace on the above element
    261 
    -    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
    261 
    +    res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name])
    262 262 
         res.assert_success()
    263 263
    264 264 
         # Then we build, and check whether the configure step succeeded

  • tests/plugins/filter.py
    ... ... @@ -108,7 +108,7 @@ def test_filter_forbid_also_rdep(datafiles, cli):
    108 108 
     def test_filter_workspace_open(datafiles, cli, tmpdir):
    109 109 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    110 110 
         workspace_dir = os.path.join(tmpdir.dirname, tmpdir.basename, "workspace")
    111 
    -    result = cli.run(project=project, args=['workspace', 'open', 'deps-permitted.bst', workspace_dir])
    111 
    +    result = cli.run(project=project, args=['workspace', 'open', '--directory', workspace_dir, 'deps-permitted.bst'])
    112 112 
         result.assert_success()
    113 113 
         assert os.path.exists(os.path.join(workspace_dir, "foo"))
    114 114 
         assert os.path.exists(os.path.join(workspace_dir, "bar"))
    ... ... @@ -120,7 +120,7 @@ def test_filter_workspace_build(datafiles, cli, tmpdir):
    120 120 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    121 121 
         tempdir = os.path.join(tmpdir.dirname, tmpdir.basename)
    122 122 
         workspace_dir = os.path.join(tempdir, "workspace")
    123 
    -    result = cli.run(project=project, args=['workspace', 'open', 'output-orphans.bst', workspace_dir])
    123 
    +    result = cli.run(project=project, args=['workspace', 'open', '--directory', workspace_dir, 'output-orphans.bst'])
    124 124 
         result.assert_success()
    125 125 
         src = os.path.join(workspace_dir, "foo")
    126 126 
         dst = os.path.join(workspace_dir, "quux")
    ... ... @@ -138,7 +138,7 @@ def test_filter_workspace_close(datafiles, cli, tmpdir):
    138 138 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    139 139 
         tempdir = os.path.join(tmpdir.dirname, tmpdir.basename)
    140 140 
         workspace_dir = os.path.join(tempdir, "workspace")
    141 
    -    result = cli.run(project=project, args=['workspace', 'open', 'output-orphans.bst', workspace_dir])
    141 
    +    result = cli.run(project=project, args=['workspace', 'open', '--directory', workspace_dir, 'output-orphans.bst'])
    142 142 
         result.assert_success()
    143 143 
         src = os.path.join(workspace_dir, "foo")
    144 144 
         dst = os.path.join(workspace_dir, "quux")
    ... ... @@ -158,7 +158,7 @@ def test_filter_workspace_reset(datafiles, cli, tmpdir):
    158 158 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    159 159 
         tempdir = os.path.join(tmpdir.dirname, tmpdir.basename)
    160 160 
         workspace_dir = os.path.join(tempdir, "workspace")
    161 
    -    result = cli.run(project=project, args=['workspace', 'open', 'output-orphans.bst', workspace_dir])
    161 
    +    result = cli.run(project=project, args=['workspace', 'open', '--diretory', workspace_dir, 'output-orphans.bst'])
    162 162 
         result.assert_success()
    163 163 
         src = os.path.join(workspace_dir, "foo")
    164 164 
         dst = os.path.join(workspace_dir, "quux")

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

    [Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]