Merge "Add a check for `rally` command"

CHANGELOG.rst

@@ -26,6 +26,8 @@ Changed
 * Add the --html-static option to commands ``rally task trends``, it could generate
   trends report with embedded js/css.
 
+* Fix an issue with calling `rally` command without arguments
+
 [1.3.0] - 2018-12-01
 --------------------
 

rally/cli/cliutils.py

@@ -576,7 +576,7 @@ def validate_deprecated_args(argv, fn):
 
 
 def run(argv, categories):
-    if argv[1] in ["version", "--version"]:
+    if len(argv) > 1 and argv[1] in ["version", "--version"]:
         _print_version()
         return 0
 

tests/functional/test_cli_functional.py

@@ -0,0 +1,33 @@
+# Copyright 2018:  ZTE Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import subprocess
+import unittest
+
+
+class CLITestCase(unittest.TestCase):
+
+    def test_rally_cli(self):
+        try:
+            output = subprocess.check_output(["rally"],
+                                             stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError as e:
+            output = e.output
+        self.assertIn("too few arguments", output)
+
+    def test_version_cli(self):
+        output = subprocess.check_output(["rally", "version"],
+                                         stderr=subprocess.STDOUT)
+        self.assertIn("Rally version:", output)