diff options
| author |   Rex Lee <limingjiang@huawei.com> | 2017-03-09 17:56:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-09 17:56:59 +0000 |
| commit | f73a21485dc963073f4232f1b131e503f457f9c5 (patch) | |
| tree | 908a536eda690058d805fea4a15c4b4ed92772df /tests/unit/benchmark/scenarios/compute/test_memload.py | |
| parent | 72030a83b2cfa9f0993e22559b2b9a6261abd6b2 (diff) | |
| parent | 381c91651ef414052abdc748cb9b4d8cac93a76a (diff) | |
Merge "Bugfix: Failed executing command: 'free -s 1 -c 10'"
Diffstat (limited to 'tests/unit/benchmark/scenarios/compute/test_memload.py')
| -rw-r--r-- | tests/unit/benchmark/scenarios/compute/test_memload.py | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/tests/unit/benchmark/scenarios/compute/test_memload.py b/tests/unit/benchmark/scenarios/compute/test_memload.py index 76625ef11..ede3309c2 100644 --- a/tests/unit/benchmark/scenarios/compute/test_memload.py +++ b/tests/unit/benchmark/scenarios/compute/test_memload.py @@ -74,18 +74,33 @@ class MEMLoadTestCase(unittest.TestCase): output = self._read_file("memload_sample_output.txt") mock_ssh.SSH().execute.return_value = (0, output, '') result = m._get_mem_usage() - expected_result = {"max": {"used": 76737332, "cached": 67252400, - "free": 187016644, "shared": 2844, - "total": 263753976, "buffers": 853528}, - "average": {"used": 76737332, "cached": 67252400, - "free": 187016644, "shared": 2844, - "total": 263753976, "buffers": 853528}, - "free": {"memory0": {"used": "76737332", - "cached": "67252400", - "free": "187016644", - "shared": "2844", - "total": "263753976", - "buffers": "853528"}}} + expected_result = { + "max": { + 'shared': 2844, + 'buff/cache': 853528, + 'total': 263753976, + 'free': 187016644, + 'used': 76737332 + }, + "average": { + 'shared': 2844, + 'buff/cache': 853528, + 'total': 263753976, + 'free': 187016644, + 'used': 76737332 + }, + "free": { + "memory0": { + "used": "76737332", + "buff/cache": "853528", + "free": "187016644", + "shared": "2844", + "total": "263753976", + "available": "67252400" + } + } + } + self.assertEqual(result, expected_result) def _read_file(self, filename): @@ -94,3 +109,11 @@ class MEMLoadTestCase(unittest.TestCase): with open(output) as f: sample_output = f.read() return sample_output + + +def main(): + unittest.main() + + +if __name__ == '__main__': + main() |