The tests are failing with this patch set: ====================================================================== FAIL: test_development_env (test_exception.ExceptionTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/alinefm/kimchi/tests/test_exception.py", line 98, in test_development_env self.assertEquals(msg, resp.get('reason')) AssertionError: 'Delete is not allowed for root' != u'Delete is not allowed for kimchiroot' ====================================================================== FAIL: test_production_env (test_exception.ExceptionTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/alinefm/kimchi/tests/test_exception.py", line 68, in test_production_env self.assertEquals(msg, resp.get('reason')) AssertionError: 'Delete is not allowed for root' != u'Delete is not allowed for kimchiroot' ====================================================================== FAIL: test_installed_paths (test_config.ConfigTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/alinefm/kimchi/tests/test_config.py", line 46, in test_installed_paths '/usr/lib/python2.7/site-packages/kimchi') File "/home/alinefm/kimchi/tests/test_config.py", line 37, in assertInstalledPath self.assertEquals(actual, expected) AssertionError: '*/usr/lib/python2.7/dist-packages/kimchi*' != '/usr/lib/python2.7/site-packages/kimchi' The install dir differ between distros. ====================================================================== FAIL: test_installed_plugin_paths (test_config.ConfigTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/alinefm/kimchi/tests/test_config.py", line 71, in test_installed_plugin_paths '/usr/lib/python2.7/site-packages/kimchi/plugins/sample') File "/home/alinefm/kimchi/tests/test_config.py", line 37, in assertInstalledPath self.assertEquals(actual, expected) AssertionError: '/usr/lib/python2.7/dist-packages/kimchi/plugins/sample' != '/usr/lib/python2.7/site-packages/kimchi/plugins/sample' ---------------------------------------------------------------------- Ran 136 tests in 110.519s FAILED (failures=4) make[3]: *** [check-local] Error 1 make[3]: Leaving directory `/home/alinefm/kimchi/tests' make[2]: *** [check-am] Error 2 make[2]: Leaving directory `/home/alinefm/kimchi/tests' make[1]: *** [check] Error 2 make[1]: Leaving directory `/home/alinefm/kimchi/tests' make: *** [check-recursive] Error 1 On 01/28/2014 04:21 AM, Mark Wu wrote:
This series of patches reorganize kimchi's path vars generation code to allow plugin use kimchi s ui handler.
Changes: v4: Fix the test break when installed to non system dirs. (per Shaohe) v3: Rebase Only access the paths instance when the request is for html, which can avoid forcibly installing paths to the plugin which just have json requests. v2: Rebase Remove the optimization for plugin paths since it just have a few instantiations.
Mark Wu (3): Reorganize the kimchi's paths gereneration code Add test cases for paths generation code Allow plugin use kimchi's ui handler
.gitignore | 1 + src/kimchi/cachebust.py | 4 +- src/kimchi/config.py.in | 155 +++++++++++++++++++----------------------------- src/kimchi/root.py | 23 ++++--- src/kimchi/server.py | 14 +++-- src/kimchi/template.py | 17 ++++-- src/kimchi/utils.py | 6 +- src/kimchid.in | 7 ++- tests/Makefile.am | 9 ++- tests/test_config.py.in | 85 ++++++++++++++++++++++++++ 10 files changed, 196 insertions(+), 125 deletions(-) create mode 100644 tests/test_config.py.in