5 files changed, 98 insertions, 5 deletions
diff --git a/tests/ci/docker/yardstick-ci/Dockerfile b/tests/ci/docker/yardstick-ci/Dockerfile
index a2164a8a2..cc23073d2 100644
--- a/tests/ci/docker/yardstick-ci/Dockerfile
+++ b/tests/ci/docker/yardstick-ci/Dockerfile
@@ -49,5 +49,4 @@ RUN cd ${YARDSTICK_REPO_DIR} && pip install .
 
 ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/opnfv/images/
 
-COPY ./run_tests.sh /usr/local/bin/
-
+COPY ./exec_tests.sh /usr/local/bin/
diff --git a/tests/ci/docker/yardstick-ci/run_tests.sh b/tests/ci/docker/yardstick-ci/exec_tests.sh
index 680a329ca..9aee240da 100755
--- a/tests/ci/docker/yardstick-ci/run_tests.sh
+++ b/tests/ci/docker/yardstick-ci/exec_tests.sh
@@ -11,7 +11,7 @@
 set -e
 
 : ${YARDSTICK_REPO:='https://gerrit.opnfv.org/gerrit/yardstick'}
-: ${YARDSTICK_REPO_DIR:='/home/opnfv/yardstick'}
+: ${YARDSTICK_REPO_DIR:='/home/opnfv/repos/yardstick'}
 : ${YARDSTICK_BRANCH:='master'} # branch, tag, sha1 or refspec
 
 : ${RELENG_REPO:='https://gerrit.opnfv.org/gerrit/releng'}
@@ -51,5 +51,5 @@ git_checkout $YARDSTICK_BRANCH $YARDSTICK_REPO
 # setup the environment
 source $YARDSTICK_REPO_DIR/tests/ci/prepare_env.sh
 
-# run tests
+# execute tests
 $YARDSTICK_REPO_DIR/tests/ci/yardstick-verify $@
diff --git a/tests/unit/benchmark/scenarios/compute/cachestat_sample_output.txt b/tests/unit/benchmark/scenarios/compute/cachestat_sample_output.txt
new file mode 100644
index 000000000..e2c79a9b1
--- /dev/null
+++ b/tests/unit/benchmark/scenarios/compute/cachestat_sample_output.txt
@@ -0,0 +1,5 @@
+Counting cache functions... Output every 1 seconds.
+    HITS   MISSES  DIRTIES    RATIO   BUFFERS_MB   CACHE_MB
+    6462        0       29   100.0%         1157      66782
+
+Ending tracing...
diff --git a/tests/unit/benchmark/scenarios/compute/test_cachestat.py b/tests/unit/benchmark/scenarios/compute/test_cachestat.py
new file mode 100644
index 000000000..f5a6b5ff9
--- /dev/null
+++ b/tests/unit/benchmark/scenarios/compute/test_cachestat.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# Unittest for yardstick.benchmark.scenarios.compute.cachestat.CACHEstat
+
+import mock
+import unittest
+import os
+
+from yardstick.benchmark.scenarios.compute import cachestat
+
+
+@mock.patch('yardstick.benchmark.scenarios.compute.cachestat.ssh')
+class CACHEstatTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.ctx = {
+            'host': {
+                'ip': '172.16.0.137',
+                'user': 'root',
+                'key_filename': "mykey.key"
+            }
+        }
+
+        self.result = {}
+
+    def test_cachestat_successful_setup(self, mock_ssh):
+        c = cachestat.CACHEstat({}, self.ctx)
+        mock_ssh.SSH().execute.return_value = (0, '', '')
+
+        c.setup()
+        self.assertIsNotNone(c.client)
+        self.assertTrue(c.setup_done)
+
+    def test_execute_command_success(self, mock_ssh):
+        c = cachestat.CACHEstat({}, self.ctx)
+        mock_ssh.SSH().execute.return_value = (0, '', '')
+        c.setup()
+
+        expected_result = 'abcdefg'
+        mock_ssh.SSH().execute.return_value = (0, expected_result, '')
+        result = c._execute_command("foo")
+        self.assertEqual(result, expected_result)
+
+    def test_execute_command_failed(self, mock_ssh):
+        c = cachestat.CACHEstat({}, self.ctx)
+        mock_ssh.SSH().execute.return_value = (0, '', '')
+        c.setup()
+
+        mock_ssh.SSH().execute.return_value = (127, '', 'Failed executing \
+            command')
+        self.assertRaises(RuntimeError, c._execute_command,
+                          "cat /proc/meminfo")
+
+    def test_get_cache_usage_successful(self, mock_ssh):
+        options = {
+            "interval": 1,
+        }
+        args = {"options": options}
+        c = cachestat.CACHEstat(args, self.ctx)
+        mock_ssh.SSH().execute.return_value = (0, '', '')
+        c.setup()
+
+        output = self._read_file("cachestat_sample_output.txt")
+        mock_ssh.SSH().execute.return_value = (0, output, '')
+        result = c._get_cache_usage()
+        expected_result = {"cachestat": {"cache0": {"HITS": "6462",\
+ "DIRTIES": "29", "RATIO": "100.0%", "MISSES": "0", "BUFFERS_MB": "1157",\
+ "CACHE_MB": "66782"}}, "average": {"HITS": 6462, "DIRTIES": 29, "RATIO": "100.0%",\
+ "MISSES": 0, "BUFFERS_MB":1157, "CACHE_MB": 66782}, "max": {"HITS": 6462,\
+ "DIRTIES": 29, "RATIO": 100.0, "MISSES": 0, "BUFFERS_MB": 1157, "CACHE_MB": 66782}}
+
+        self.assertEqual(result, expected_result)
+
+    def _read_file(self, filename):
+        curr_path = os.path.dirname(os.path.abspath(__file__))
+        output = os.path.join(curr_path, filename)
+        with open(output) as f:
+            sample_output = f.read()
+        return sample_output
diff --git a/tests/unit/benchmark/scenarios/compute/test_ramspeed.py b/tests/unit/benchmark/scenarios/compute/test_ramspeed.py
index 3de84c74c..100102d19 100644
--- a/tests/unit/benchmark/scenarios/compute/test_ramspeed.py
+++ b/tests/unit/benchmark/scenarios/compute/test_ramspeed.py
@@ -228,7 +228,8 @@ class RamspeedTestCase(unittest.TestCase):
         args = {'options': options}
         r = ramspeed.Ramspeed(args, self.ctx)
 
-        mock_ssh.SSH().execute.return_value = (1, '', 'No such type_id: 30 for Ramspeed scenario')
+        mock_ssh.SSH().execute.return_value = (1, '', 'No such type_id: 30 for \
+                                               Ramspeed scenario')
         self.assertRaises(RuntimeError, r.run, self.result)