diff --git a/os_refresh_config/os_refresh_config.py b/os_refresh_config/os_refresh_config.py old mode 100755 new mode 100644 index 260e086..9aabea5 --- a/os_refresh_config/os_refresh_config.py +++ b/os_refresh_config/os_refresh_config.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # @@ -159,7 +158,3 @@ def main(argv=sys.argv): log.debug('No dir for phase %s' % phase) return exit(lock) - - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/os_refresh_config/tests/test_cmd.py b/os_refresh_config/tests/test_cmd.py index 49038a8..ffa6a14 100644 --- a/os_refresh_config/tests/test_cmd.py +++ b/os_refresh_config/tests/test_cmd.py @@ -17,16 +17,11 @@ import time import fixtures import testtools -script_path = os.path.join( - os.path.dirname(os.path.realpath(__file__)), - '../os_refresh_config.py') - class TestCmd(testtools.TestCase): def setUp(self): super(TestCmd, self).setUp() - self.assertTrue(os.path.exists(script_path)) self.useFixture(fixtures.NestedTempfile()) self.base_dir = self.useFixture(fixtures.TempDir()) self.lockdir = self.useFixture(fixtures.TempDir()) @@ -49,7 +44,7 @@ class TestCmd(testtools.TestCase): 'PATH': os.environ.get('PATH') } cmd_args = [ - script_path, + 'os-refresh-config', '--lockfile', self.lockfile ] if args: diff --git a/tox.ini b/tox.ini index c7f1b5f..fee347a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] minversion = 3.1.0 -skipsdist = True envlist = py3,pep8 skip_missing_interpreters = true # this allows tox to infer the base python from the environment name @@ -14,7 +13,6 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -install_command = pip install {opts} {packages} commands = stestr run --slowest {posargs}