Add a couple more teststiagogomes/unit-test-fixes

Also fix a small error detected by the new tests.

2 files changed, 93 insertions, 7 deletions

diff --git a/sandboxlib/__init__.py b/sandboxlib/__init__.py
index beaf7b2..1418225 100644
--- a/sandboxlib/__init__.py
+++ b/sandboxlib/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Codethink Limited
+# Copyright (C) 2015, 2016  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -195,7 +195,7 @@ def validate_extra_mounts(extra_mounts):
     for mount_entry in extra_mounts:
         if mount_entry[1] is None:
             raise AssertionError(
-                "Mount point empty in mount entry %s" % mount_entry)
+                "Mount point empty in mount entry %s" % str(mount_entry))
 
         if len(mount_entry) == 3:
             full_mount_entry = list(mount_entry) + ['']
@@ -203,7 +203,7 @@ def validate_extra_mounts(extra_mounts):
             full_mount_entry = list(mount_entry)
         else:
             raise AssertionError(
-                "Invalid mount entry in 'extra_mounts': %s" % mount_entry)
+                "Invalid mount entry in 'extra_mounts': %s" % str(mount_entry))
 
         # Convert all the entries to strings to prevent type errors later
         # on. None is special cased to the empty string, as str(None) is
diff --git a/tests/test_all.py b/tests/test_all.py
index 197dc37..eed6d26 100644
--- a/tests/test_all.py
+++ b/tests/test_all.py
@@ -40,7 +40,7 @@ def test_no_output(sandboxlib_executor):
     '''Test ignoring of stderr/stdout.
 
     We could use run_sandbox_with_redirection() and not get the 'err' and 'out'
-    paramemter at all, but we may as well test that they are indeed None.
+    parameters at all, but we may as well test that they are indeed None.
 
     '''
     exit, out, err = sandboxlib_executor.run_sandbox(
@@ -50,14 +50,39 @@ def test_no_output(sandboxlib_executor):
     assert out is None
     assert err is None
 
-
-def test_stdout(sandboxlib_executor):
+def test_output(sandboxlib_executor):
     exit, out, err = sandboxlib_executor.run_sandbox(['echo', 'xyzzy'])
 
     assert exit == 0
     assert out.decode('unicode-escape') == 'xyzzy\n'
     assert err.decode('unicode-escape') == ''
 
+    exit, out, err = sandboxlib_executor.run_sandbox(
+        ['sh', '-c', 'echo xyzzy >&2; exit 11'])
+
+    assert exit == 11
+    assert out.decode('unicode-escape') == ''
+    assert err.decode('unicode-escape') == 'xyzzy\n'
+
+def test_output_redirection(sandboxlib_executor, tmpdir):
+    outlog_fp = str(tmpdir.join('outlog.txt'))
+    errlog_fp = str(tmpdir.join('errlog.txt'))
+    with open(outlog_fp, 'w') as outlog, open(errlog_fp, 'w') as errlog:
+        exit = sandboxlib_executor.run_sandbox_with_redirection(
+             ['sh', '-c', 'echo abcde; echo xyzzy >&2'],
+             stdout=outlog, stderr=errlog)
+
+    with open(outlog_fp) as outlog, open(errlog_fp) as errlog:
+        assert outlog.read() == 'abcde\n'
+        assert errlog.read() == 'xyzzy\n'
+
+    with open(outlog_fp, 'w') as outlog, open(errlog_fp, 'w') as errlog:
+        exit = sandboxlib_executor.run_sandbox_with_redirection(
+             ['sh', '-c', 'echo abcde; echo xyzzy >&2'],
+             stdout=outlog, stderr=sandboxlib.STDOUT)
+
+    with open(outlog_fp) as outlog:
+        assert outlog.read() == 'abcde\nxyzzy\n'
 
 def test_current_working_directory(sandboxlib_executor, tmpdir):
     exit, out, err = sandboxlib_executor.run_sandbox(
@@ -67,6 +92,33 @@ def test_current_working_directory(sandboxlib_executor, tmpdir):
     assert out.decode('unicode-escape') == '%s\n' % str(tmpdir)
     assert err.decode('unicode-escape') == ''
 
+def test_environment(sandboxlib_executor):
+    exit, out, err = sandboxlib_executor.run_sandbox(
+        ['env'], env={'foo': 'bar'})
+
+    assert exit == 0
+    assert out.decode('unicode-escape') == 'foo=bar\n'
+    assert err.decode('unicode-escape') == ''
+
+def test_isolated_mounts(sandboxlib_executor):
+    if sandboxlib_executor == sandboxlib.chroot:
+        pytest.skip('chroot backend does not support mounts isolation')
+    elif sandboxlib_executor == sandboxlib.linux_user_chroot:
+       # linux-user-chroot always creates a new mount namespace
+       pass
+
+def test_isolated_network(sandboxlib_executor):
+    if sandboxlib_executor == sandboxlib.chroot:
+        pytest.skip('chroot backend does not support network isolation')
+
+    exit, out, err = sandboxlib_executor.run_sandbox(
+        ['sh', '-c', 'cat /proc/net/dev | sed 1,2d | cut -f1 -d:'],
+        network='isolated')
+
+    assert exit == 0
+    assert out.decode('unicode-escape').strip() == 'lo'
+    assert err.decode('unicode-escape') == ''
+
 
 class TestMounts(object):
     @pytest.fixture()
@@ -101,6 +153,21 @@ class TestMounts(object):
         assert out.decode('unicode-escape') == "/dev/shm exists"
         assert exit == 0
 
+    def test_invalid_mount_specs(self, sandboxlib_executor):
+        with pytest.raises(AssertionError) as excinfo:
+            exit, out, err = sandboxlib_executor.run_sandbox(
+                ['true'], extra_mounts=[('proc', None, 'tmpfs')])
+
+            assert excinfo.value.message == (
+                "Mount point empty in mount entry ('proc', None, 'tmpfs')")
+
+        with pytest.raises(AssertionError) as excinfo:
+            exit, out, err = sandboxlib_executor.run_sandbox(
+                ['true'], extra_mounts=[('proc', 'tmpfs')])
+
+            assert excinfo.value.message == (
+                "Invalid mount entry in 'extra_mounts': ('proc', 'tmpfs')")
+
 
 class TestWriteablePaths(object):
     @pytest.fixture()
@@ -195,8 +262,18 @@ class TestWriteablePaths(object):
 def test_executor_for_platform():
     '''Simple test of backend autodetection.'''
     executor = sandboxlib.executor_for_platform()
-    test_stdout(executor)
+    test_output(executor)
+
+def test_sandboxlib_backend_env_var(sandboxlib_executor):
+    executor_name = sandboxlib_executor.__name__.split('.')[-1]
+    os.environ["SANDBOXLIB_BACKEND"] = executor_name
+    executor = sandboxlib.executor_for_platform()
+    assert executor == sandboxlib_executor
 
+def test_sandboxlib_backend_env_var_unknown_executor():
+    executor = sandboxlib.executor_for_platform()
+    os.environ["SANDBOXLIB_BACKEND"] = "unknown"
+    assert executor == sandboxlib.executor_for_platform()
 
 def test_degrade_config_for_capabilities(sandboxlib_executor):
     '''Simple test of adjusting configuration for a given backend.'''
@@ -208,3 +285,12 @@ def test_degrade_config_for_capabilities(sandboxlib_executor):
 
     out_config = sandboxlib_executor.degrade_config_for_capabilities(
         in_config, warn=True)
+
+    if sandboxlib_executor == sandboxlib.chroot:
+        assert out_config == {
+            'mounts': 'undefined',
+            'network': 'undefined',
+            'filesystem_writable_paths': 'all'
+        }
+    elif sandboxlib_executor == sandboxlib.linux_user_chroot:
+        assert out_config == in_config