summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2016-10-11 02:32:03 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-11 02:32:03 +0000
commit6d1312d00a3149420db905c6bdfe2756abc55695 (patch)
treea21edfc62f6d56d4bd722494edb592045f9ec287
parent49a6694e6c286a12fcdc3b130315b92c1445e05b (diff)
parent8c93dffbb4bf51e60096cab465dbd2a5f62feb34 (diff)
Merge "Rename class cli to Cli"
-rw-r--r--func/cli.py2
-rw-r--r--qtip.py4
-rw-r--r--tests/cli_test.py6
3 files changed, 6 insertions, 6 deletions
diff --git a/func/cli.py b/func/cli.py
index 9222da51..d914a2de 100644
--- a/func/cli.py
+++ b/func/cli.py
@@ -13,7 +13,7 @@ import args_handler
import argparse
-class cli:
+class Cli:
@staticmethod
def _parse_args(args):
diff --git a/qtip.py b/qtip.py
index f95bb707..094483fe 100644
--- a/qtip.py
+++ b/qtip.py
@@ -6,13 +6,13 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-from func.cli import cli
+from func.cli import Cli
import os
def main():
os.system('./data/file_permission.sh')
- cli()
+ Cli()
# os.system('cd data/ref_results && python compute_suite.py')
# os.system('cd data/ref_results && python storage_suite.py')
# os.system('cd data/ref_results && python network_suite.py')
diff --git a/tests/cli_test.py b/tests/cli_test.py
index fe05327d..12d0abb0 100644
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -1,7 +1,7 @@
import pytest
import mock
import os
-from func.cli import cli
+from func.cli import Cli
class TestClass:
@@ -19,7 +19,7 @@ class TestClass:
k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel', 'PWD': '/home'})
with pytest.raises(SystemExit):
k.start()
- cli(test_input)
+ Cli(test_input)
k.stop()
resout, reserr = capfd.readouterr()
assert expected in resout
@@ -35,7 +35,7 @@ class TestClass:
def test_cli_successful(self, mock_args_handler, test_input, expected):
k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel', 'PWD': '/home'})
k.start()
- cli(test_input)
+ Cli(test_input)
k.stop()
call_list = map(lambda x: mock_args_handler.call_args_list[x][0], range(len(expected)))
assert sorted(call_list) == sorted(expected)