formatting

This commit is contained in:
Michael Gummelt
2015-04-15 13:52:23 -07:00
parent 9f707b88d0
commit cdcf7e30d7
3 changed files with 5 additions and 6 deletions

View File

@@ -27,7 +27,6 @@ to read about a specific subcommand.
"""
import logging
import os
import sys
from subprocess import PIPE, Popen
@@ -36,14 +35,12 @@ import analytics
import dcoscli
import docopt
import requests
from dcos.api import constants, emitting, subcommand, util, config
from dcos.api import config, constants, emitting, subcommand, util
from dcoscli.constants import SEGMENT_IO_WRITE_KEY
emitter = emitting.FlatEmitter()
def main():
if not _is_valid_configuration():
return 1
@@ -100,6 +97,7 @@ def wait_and_track(subproc):
return exit_code
def track(exit_code, err):
# segment.io analytics
try:
@@ -117,7 +115,6 @@ def track(exit_code, err):
pass
def _config_log_level_environ(log_level):
"""
:param log_level: Log level to set

View File

@@ -10,9 +10,10 @@ from common import exec_command
@pytest.fixture
def env():
config_path = os.path.join("tests", "data", "config", "dcos.toml")
return {
constants.PATH_ENV: os.environ[constants.PATH_ENV],
constants.DCOS_CONFIG_ENV: os.path.join("tests", "data", "config", "dcos.toml")
constants.DCOS_CONFIG_ENV: config_path
}

View File

@@ -127,6 +127,7 @@ def test_invalid_log_level_flag():
b"'critical']\n")
assert stderr == b''
def _mock_analytics_run(args):
with mock.patch('sys.argv', args):
analytics.track = Mock()