fix typos

cli/dcoscli/log.py

@@ -222,7 +222,7 @@ def has_journald_capability():
 
 
 def has_log_v2_capability():
-    """ function checks thec cosmos capability LOGGING_V2
+    """ function checks the cosmos capability LOGGING_V2
         to know if `dcos-log` suppports v2 on the cluster.
 
         :return: cosmos has LOGGING_V2 capability.

cli/dcoscli/node/main.py

@@ -729,7 +729,7 @@ def _build_leader_url(component, version=1):
     :rtype: str
     """
 
-    if version < 1 and version > 2:
+    if version < 1 or version > 2:
         raise DCOSException('valid API versions: 1, 2.Used {}'.format(version))
 
     leaders_map = {

cli/dcoscli/task/main.py

@@ -346,8 +346,8 @@ def _dcos_log_v2(follow, tasks, lines, file_):
 
     :param follow: same as unix tail's -f
     :type follow: bool
-    :param task: task pattern to match
-    :type task: str
+    :param tasks: tasks pattern to match
+    :type tasks: list of str
     :param lines: number of lines to print
     :type lines: int
     :param file_: file path to read
@@ -356,7 +356,7 @@ def _dcos_log_v2(follow, tasks, lines, file_):
 
     if len(tasks) != 1:
         raise DCOSException(
-            "found more then one task with the same name: {}. Please provide "
+            "found more than one task with the same name: {}. Please provide "
             "a unique task name.".format([task['id'] for task in tasks]))
 
     task = tasks[0]

cli/tests/unit/test_node.py

@@ -194,9 +194,9 @@ def test_node_diagnostics_download(mock_get_diagnostics_list, mock_do_request,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_v2_leader_mesos(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_v2_leader_mesos(mocked_dcos_log_enabled, mocked_http_get,
                                   mocked_get_config_val):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200
@@ -213,9 +213,9 @@ def test_dcos_log_v2_leader_mesos(mocked_dcos_log_enabked, mocked_http_get,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_v2_leader_marathon(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_v2_leader_marathon(mocked_dcos_log_enabled, mocked_http_get,
                                      mocked_get_config_val):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200
@@ -234,9 +234,9 @@ def test_dcos_log_v2_leader_marathon(mocked_dcos_log_enabked, mocked_http_get,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_v2_sse(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_v2_sse(mocked_dcos_log_enabled, mocked_http_get,
                          mocked_get_config_val, mocked_follow_logs):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200
@@ -253,9 +253,9 @@ def test_dcos_log_v2_sse(mocked_dcos_log_enabked, mocked_http_get,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_v2_filters(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_v2_filters(mocked_dcos_log_enabled, mocked_http_get,
                              mocked_get_config_val, mocked_follow_logs):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200
@@ -275,9 +275,9 @@ def test_dcos_log_v2_filters(mocked_dcos_log_enabked, mocked_http_get,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_leader_mesos(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_leader_mesos(mocked_dcos_log_enabled, mocked_http_get,
                                mocked_get_config_val):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200
@@ -294,9 +294,9 @@ def test_dcos_log_leader_mesos(mocked_dcos_log_enabked, mocked_http_get,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_leader_marathon(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_leader_marathon(mocked_dcos_log_enabled, mocked_http_get,
                                   mocked_get_config_val):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200
@@ -315,9 +315,9 @@ def test_dcos_log_leader_marathon(mocked_dcos_log_enabked, mocked_http_get,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_stream(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_stream(mocked_dcos_log_enabled, mocked_http_get,
                          mocked_get_config_val, mocked_follow_logs):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200
@@ -335,9 +335,9 @@ def test_dcos_log_stream(mocked_dcos_log_enabked, mocked_http_get,
 @mock.patch('dcos.config.get_config_val')
 @mock.patch('dcos.http.get')
 @mock.patch('dcoscli.log.dcos_log_enabled')
-def test_dcos_log_filters(mocked_dcos_log_enabked, mocked_http_get,
+def test_dcos_log_filters(mocked_dcos_log_enabled, mocked_http_get,
                           mocked_get_config_val, mocked_follow_logs):
-    mocked_dcos_log_enabked.return_value = True
+    mocked_dcos_log_enabled.return_value = True
 
     m = mock.MagicMock()
     m.status_code = 200