summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2006-05-12 09:24:55 -0400
committerJim Meyering <jim@meyering.net>2006-05-12 09:24:55 -0400
commitfc2bae004b0c6763e7262090ee73a720bf8159cd (patch)
treefc13b5eb544687c72f2aecaedc3d86a0bfff4b89
parent9d70c830c384f06ef636d7cb8066b0a664ef9143 (diff)
downloadthird_party-cobbler-fc2bae004b0c6763e7262090ee73a720bf8159cd.tar.gz
third_party-cobbler-fc2bae004b0c6763e7262090ee73a720bf8159cd.tar.xz
third_party-cobbler-fc2bae004b0c6763e7262090ee73a720bf8159cd.zip
Make unit tests use cobbler.py instead of the /usr/bin wrapper script
-rwxr-xr-xcobbler/cobbler.py5
-rw-r--r--tests/tests.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py
index 01639ca..710fb05 100755
--- a/cobbler/cobbler.py
+++ b/cobbler/cobbler.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
"""
Command line interface for cobbler, a network provisioning configuration
library. Consult 'man cobbler' for general info. This class serves
@@ -269,4 +271,5 @@ def main():
sys.exit(1)
sys.exit(0)
-
+if __name__ == "__main__":
+ sys.exit(main())
diff --git a/tests/tests.py b/tests/tests.py
index 03fa5f6..4d670ba 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -286,7 +286,7 @@ class TestCLIBasic(BootTest):
# nothing major is broke at top level. Full CLI command testing
# is not included (yet) since the API tests hit that fairly throughly
# and it would easily double the length of the tests.
- app = "cobbler/cobbler"
+ app = "cobbler/cobbler.py"
self.assertTrue(subprocess.call([app,"list"]) == 0)
if __name__ == "__main__":