From ab707e87f53249d7f2aac17683254b54196f90ce Mon Sep 17 00:00:00 2001 From: Chandan Singh Date: Tue, 5 Nov 2019 13:40:03 +0000 Subject: Use 119 line length --- tests/examples/junctions.py | 42 ++++++++---------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) (limited to 'tests/examples/junctions.py') diff --git a/tests/examples/junctions.py b/tests/examples/junctions.py index e93db8a68..c0a83a254 100644 --- a/tests/examples/junctions.py +++ b/tests/examples/junctions.py @@ -9,24 +9,14 @@ from buildstream.testing._utils.site import IS_LINUX, MACHINE_ARCH, HAVE_SANDBOX pytestmark = pytest.mark.integration -DATA_DIR = os.path.join( - os.path.dirname(os.path.realpath(__file__)), - "..", - "..", - "doc", - "examples", - "junctions", -) +DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..", "doc", "examples", "junctions",) # Test that the project builds successfully @pytest.mark.skipif(MACHINE_ARCH != "x86-64", reason="Examples are written for x86-64") +@pytest.mark.skipif(not IS_LINUX or not HAVE_SANDBOX, reason="Only available on linux with bubblewrap") @pytest.mark.skipif( - not IS_LINUX or not HAVE_SANDBOX, reason="Only available on linux with bubblewrap" -) -@pytest.mark.skipif( - HAVE_SANDBOX == "chroot", - reason="This test is not meant to work with chroot sandbox", + HAVE_SANDBOX == "chroot", reason="This test is not meant to work with chroot sandbox", ) @pytest.mark.datafiles(DATA_DIR) def test_build(cli, datafiles): @@ -38,12 +28,9 @@ def test_build(cli, datafiles): # Test the callHello script works as expected. @pytest.mark.skipif(MACHINE_ARCH != "x86-64", reason="Examples are written for x86-64") +@pytest.mark.skipif(not IS_LINUX or not HAVE_SANDBOX, reason="Only available on linux with bubblewrap") @pytest.mark.skipif( - not IS_LINUX or not HAVE_SANDBOX, reason="Only available on linux with bubblewrap" -) -@pytest.mark.skipif( - HAVE_SANDBOX == "chroot", - reason="This test is not meant to work with chroot sandbox", + HAVE_SANDBOX == "chroot", reason="This test is not meant to work with chroot sandbox", ) @pytest.mark.datafiles(DATA_DIR) def test_shell_call_hello(cli, datafiles): @@ -52,10 +39,7 @@ def test_shell_call_hello(cli, datafiles): result = cli.run(project=project, args=["build", "callHello.bst"]) result.assert_success() - result = cli.run( - project=project, - args=["shell", "callHello.bst", "--", "/bin/sh", "callHello.sh"], - ) + result = cli.run(project=project, args=["shell", "callHello.bst", "--", "/bin/sh", "callHello.sh"],) result.assert_success() assert result.output == "Calling hello:\nHello World!\nThis is amhello 1.0.\n" @@ -68,19 +52,9 @@ def test_open_cross_junction_workspace(cli, tmpdir, datafiles): workspace_dir = os.path.join(str(tmpdir), "workspace_hello_junction") result = cli.run( - project=project, - args=[ - "workspace", - "open", - "--directory", - workspace_dir, - "hello-junction.bst:hello.bst", - ], + project=project, args=["workspace", "open", "--directory", workspace_dir, "hello-junction.bst:hello.bst",], ) result.assert_success() - result = cli.run( - project=project, - args=["workspace", "close", "--remove-dir", "hello-junction.bst:hello.bst"], - ) + result = cli.run(project=project, args=["workspace", "close", "--remove-dir", "hello-junction.bst:hello.bst"],) result.assert_success() -- cgit v1.2.1