diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2014-05-13 21:30:41 +0200 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2014-05-13 21:30:41 +0200 |
| commit | 97c9de0203c6985ade8caefbd73a551aeba2cec3 (patch) | |
| tree | ad2c739a788701391cf6ae0e714b1b5c606f86b9 /tests/test.py | |
| parent | 1b574598e07cd4da7818f76f5f396bc633ba3f8b (diff) | |
| parent | 5c208a317fc9d9d06fcac9ea7114cfb8abd5bf60 (diff) | |
| download | docker-py-97c9de0203c6985ade8caefbd73a551aeba2cec3.tar.gz | |
Merge pull request #221 from tutumcloud/memoryswap
memory swap limit support
Diffstat (limited to 'tests/test.py')
| -rw-r--r-- | tests/test.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tests/test.py b/tests/test.py index b3d0141..2cffb67 100644 --- a/tests/test.py +++ b/tests/test.py @@ -187,7 +187,8 @@ class DockerClientTest(unittest.TestCase): "AttachStdin": false, "Memory": 0, "AttachStderr": true, "AttachStdout": true, "StdinOnce": false, - "OpenStdin": false, "NetworkDisabled": false}''')) + "OpenStdin": false, "NetworkDisabled": false, + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) @@ -211,7 +212,8 @@ class DockerClientTest(unittest.TestCase): "AttachStderr": true, "AttachStdout": true, "OpenStdin": false, "StdinOnce": false, - "NetworkDisabled": false}''')) + "NetworkDisabled": false, + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) @@ -237,7 +239,8 @@ class DockerClientTest(unittest.TestCase): "AttachStderr": true, "AttachStdout": true, "OpenStdin": false, "StdinOnce": false, - "NetworkDisabled": false}''')) + "NetworkDisabled": false, + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) @@ -260,7 +263,8 @@ class DockerClientTest(unittest.TestCase): "AttachStdout": true, "OpenStdin": false, "StdinOnce": false, "NetworkDisabled": false, - "Entrypoint": "cowsay"}''')) + "Entrypoint": "cowsay", + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) @@ -283,7 +287,8 @@ class DockerClientTest(unittest.TestCase): "AttachStdout": true, "OpenStdin": false, "StdinOnce": false, "NetworkDisabled": false, - "CpuShares": 5}''')) + "CpuShares": 5, + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) @@ -306,7 +311,8 @@ class DockerClientTest(unittest.TestCase): "AttachStdout": true, "OpenStdin": false, "StdinOnce": false, "NetworkDisabled": false, - "WorkingDir": "/root"}''')) + "WorkingDir": "/root", + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) @@ -325,7 +331,8 @@ class DockerClientTest(unittest.TestCase): "AttachStdin": true, "Memory": 0, "AttachStderr": true, "AttachStdout": true, "StdinOnce": true, - "OpenStdin": true, "NetworkDisabled": false}''')) + "OpenStdin": true, "NetworkDisabled": false, + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) @@ -369,7 +376,8 @@ class DockerClientTest(unittest.TestCase): "AttachStdin": false, "Memory": 0, "AttachStderr": true, "AttachStdout": true, "StdinOnce": false, - "OpenStdin": false, "NetworkDisabled": false}''')) + "OpenStdin": false, "NetworkDisabled": false, + "MemorySwap": 0}''')) self.assertEqual(args[1]['headers'], {'Content-Type': 'application/json'}) self.assertEqual(args[1]['params'], {'name': 'marisa-kirisame'}) |