Merge branch 'master' of github.com:docker/docker-py

1 files changed, 34 insertions, 0 deletions

diff --git a/tests/integration_test.py b/tests/integration_test.py
index 2de4a7f..6ba9c19 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -896,6 +896,40 @@ class TestExecuteCommandString(BaseTestCase):
 
 
 @unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
+class TestExecuteCommandStringAsUser(BaseTestCase):
+    def runTest(self):
+        container = self.client.create_container('busybox', 'cat',
+                                                 detach=True, stdin_open=True)
+        id = container['Id']
+        self.client.start(id)
+        self.tmp_containers.append(id)
+
+        res = self.client.exec_create(id, 'whoami', user='default')
+        self.assertIn('Id', res)
+
+        exec_log = self.client.exec_start(res)
+        expected = b'default' if six.PY3 else 'default\n'
+        self.assertEqual(exec_log, expected)
+
+
+@unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
+class TestExecuteCommandStringAsRoot(BaseTestCase):
+    def runTest(self):
+        container = self.client.create_container('busybox', 'cat',
+                                                 detach=True, stdin_open=True)
+        id = container['Id']
+        self.client.start(id)
+        self.tmp_containers.append(id)
+
+        res = self.client.exec_create(id, 'whoami')
+        self.assertIn('Id', res)
+
+        exec_log = self.client.exec_start(res)
+        expected = b'root' if six.PY3 else 'root\n'
+        self.assertEqual(exec_log, expected)
+
+
+@unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
 class TestExecuteCommandStreaming(BaseTestCase):
     def runTest(self):
         container = self.client.create_container('busybox', 'cat',