More tests.

diff --git a/cdist/cmd_test.py b/cdist/cmd_test.py
index 2d75a3af2790a5913ac5988873e0145b7366e3bc..b23d62ba25952fda46f39da909770228aa55c9c4 100644 (file)
--- a/cdist/cmd_test.py
+++ b/cdist/cmd_test.py
@@ -1,3 +1,26 @@
+#
+#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import os
+
+from util import *
+from target import factory as target_factory
+from tree_directory import TreeDirectory
+
 class CmdTest(object):
     def __init__(self):
         self.name = 'test'

diff --git a/cdist/tests/test_cmd_release.py b/cdist/tests/test_cmd_release.py
index 400e8af6c3647fb55f1990a75175b35e8f197bad..6d6bb525976739eea13f200a167ba9fe32e3bca2 100644 (file)
--- a/cdist/tests/test_cmd_release.py
+++ b/cdist/tests/test_cmd_release.py
@@ -21,21 +21,21 @@ from unittest import TestCase
 
 import cdist.cmd_release
 import cdist.globals
-from cdist.util import command
+from cdist.util import command, chdir
 import prepare
 
 class TestCmdRelease(TestCase):
     def test(self):
 
         prepare.project()
-        os.chdir('test/project.git')
+        chdir('test/project.git')
         with open('wscript', 'w') as f:
             print>>f,"VERSION = '0.0.1'"
         command('git add wscript')
         command('git commit -a -m "foo"')
         # Allow pushing to a non-bare repo for this test
         command('git config receive.denyCurrentBranch ignore')
-        os.chdir('../..')
+        chdir('../..')
 
         class Args:
             target = 'test'
@@ -55,3 +55,4 @@ class TestCmdRelease(TestCase):
         command('git reset --hard')
         with open('wscript', 'r') as f:
             self.assertEquals(f.readline().strip(), "VERSION = '0.1.0devel'")
+        chdir('../../')

diff --git a/cdist/tests/test_cmd_revision.py b/cdist/tests/test_cmd_revision.py
index 02d9ed8ff072443df943132de162f0280403f976..2a714ef333a3fbcfc6a64cb0a4838c8ca4b4dd14 100644 (file)
--- a/cdist/tests/test_cmd_revision.py
+++ b/cdist/tests/test_cmd_revision.py
@@ -21,7 +21,7 @@ from unittest import TestCase
 
 import cdist.cmd_revision
 import cdist.globals
-from cdist.util import command, command_and_read
+from cdist.util import command, command_and_read, chdir
 import prepare
 
 class TestCmdRevision(TestCase):
@@ -39,9 +39,9 @@ class TestCmdRevision(TestCase):
             output = os.path.abspath('test')
         cdist.globals.config.set('git_prefix', 'test')
 
-        os.chdir('test/project.git')
+        chdir('test/project.git')
         check = cdist.util.command_and_read('git rev-parse HEAD').readline().strip()[:7]
-        os.chdir('../..')
+        chdir('../..')
         
         self.assertEquals(cdist.cmd_revision.CmdRevision().run(Args()), check)
 

diff --git a/cdist/tests/test_cmd_test.py b/cdist/tests/test_cmd_test.py
new file mode 100644 (file)
index 0000000..f8f6c21
--- /dev/null
+++ b/cdist/tests/test_cmd_test.py
@@ -0,0 +1,50 @@
+#
+#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import os
+import shutil
+from unittest import TestCase
+
+import cdist.cmd_test
+import cdist.globals
+from cdist.util import command, chdir, log
+import prepare
+
+class TestCmdTest(TestCase):
+    def test(self):
+
+        prepare.project()
+        chdir('test/project.git')
+        with open('cscript', 'a') as f:
+            print>>f,'import os'
+            print>>f,'def test(target):'
+            print>>f,'    os.system("touch tested")'
+        command('git commit -a -m "foo"')
+        chdir('../..')
+
+        class Args:
+            target = 'test'
+            debug = False
+            work = 'test'
+            project = 'project'
+            checkout = None
+            keep = False
+            output = os.path.abspath('test')
+        cdist.globals.config.set('git_prefix', 'test')
+        cdist.cmd_test.CmdTest().run(Args())
+
+        self.assertTrue(os.path.exists('test/src/project/tested'))