Repository: incubator-slider Updated Branches: refs/heads/develop cc9d0d063 -> 1890c427b
SLIDER-630. slider-assembly unit tests fail on debian and suse and windows Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1890c427 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1890c427 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1890c427 Branch: refs/heads/develop Commit: 1890c427b881934e80f1d426a8bc6b5643fd878b Parents: cc9d0d0 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Sun Nov 9 14:56:19 2014 -0800 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Sun Nov 9 14:56:19 2014 -0800 ---------------------------------------------------------------------- .../src/test/python/scripts/TestSlider.py | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1890c427/slider-assembly/src/test/python/scripts/TestSlider.py ---------------------------------------------------------------------- diff --git a/slider-assembly/src/test/python/scripts/TestSlider.py b/slider-assembly/src/test/python/scripts/TestSlider.py index 6fe2a47..0ed5386 100644 --- a/slider-assembly/src/test/python/scripts/TestSlider.py +++ b/slider-assembly/src/test/python/scripts/TestSlider.py @@ -25,28 +25,40 @@ import unittest import logging import slider import os +import platform + +IS_WINDOWS = platform.system() == "Windows" logger = logging.getLogger() class TestSlider(unittest.TestCase): + @patch("os.environ.get") @patch.object(slider, "confDir") @patch.object(slider, "libDir") @patch.object(slider, "executeEnvSh") @patch("os.path.exists") @patch.object(slider, "java") - def test_main(self, java_mock, exists_mock, executeEnvSh_mock, libDir_mock, confDir_mock): + def test_main(self, java_mock, exists_mock, executeEnvSh_mock, libDir_mock, confDir_mock, os_env_get_mock): sys.argv = ["slider", "list"] exists_mock.return_value = True libDir_mock.return_value = "/dir/libdir" confDir_mock.return_value = "/dir/confdir" + os_env_get_mock.return_value = "env_val" slider.main() self.assertTrue(java_mock.called) - java_mock.assert_called_with( - 'org.apache.slider.Slider', - ['list'], - '/dir/libdir/*:/dir/confdir::', - ['-Dslider.confdir=/dir/confdir', '-Dslider.libdir=/dir/libdir', '-Djava.net.preferIPv4Stack=true', '-Djava.awt.headless=true', '-Xmx256m']) + if IS_WINDOWS: + java_mock.assert_called_with( + 'org.apache.slider.Slider', + ['list'], + '/dir/libdir\\*;/dir/confdir;env_val;env_val', + ['-Dslider.confdir=/dir/confdir', '-Dslider.libdir=/dir/libdir', 'env_val']) + else: + java_mock.assert_called_with( + 'org.apache.slider.Slider', + ['list'], + '/dir/libdir/*:/dir/confdir:env_val:env_val', + ['-Dslider.confdir=/dir/confdir', '-Dslider.libdir=/dir/libdir', 'env_val']) pass