diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 22:12:20 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 22:12:20 -0400 |
| commit | bc35aa70ab8794b73019d90a41eb252fbb80ff52 (patch) | |
| tree | 3cce934901374c67c1f56d5841643028dc058ae6 /testsuite | |
| parent | 0fae9849fd7047c299468fd6728db56d6861ee12 (diff) | |
| download | bcfg2-bc35aa70ab8794b73019d90a41eb252fbb80ff52.tar.gz bcfg2-bc35aa70ab8794b73019d90a41eb252fbb80ff52.tar.bz2 bcfg2-bc35aa70ab8794b73019d90a41eb252fbb80ff52.zip | |
testsuite: fixed more unit test stuff
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py | 1 | ||||
| -rwxr-xr-x | testsuite/install.sh | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py index b77e4b647..58e61e13b 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py @@ -235,7 +235,6 @@ class TestDirectoryBacked(Bcfg2TestCase): mock_isdir.return_value = True for path in self.testpaths.values(): reset() - print "testing %s" % path db.add_directory_monitor(path) db.fam.AddMonitor.assert_called_with(os.path.join(db.data, path), db) diff --git a/testsuite/install.sh b/testsuite/install.sh index c6249002d..817ed5911 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -9,7 +9,8 @@ PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0: if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then pip install --use-mirrors genshi PyYAML pyinotify if [[ $PYVER == "2.5" ]]; then - pip install --use-mirrors simplejson + # markdown 2.2+ doesn't work on py2.5 + pip install --use-mirrors simplejson 'markdown<2.2' fi if [[ ${PYVER:0:1} == "2" ]]; then # django supports py3k, but South doesn't, and the django bits |