From ff7ea14689f0df52a95e9b125098a4f81fb3ad7b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 17 Dec 2014 18:17:19 +0100 Subject: [PATCH] Fixed test that didn't pass anymore (since there were more settings). I also enforced python3 in ci-build.sh otherwise python2.7 would generate syntax errors. Hope it's not a problem --- ci-build.sh | 2 +- tests/test_core_modules.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-build.sh b/ci-build.sh index 148d474..6979021 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -9,7 +9,7 @@ pep8 --ignore E501 i3pystatus tests # Check that the setup.py script works rm -rf ${BUILD}/test-install ${BUILD}/test-install-bin mkdir ${BUILD}/test-install ${BUILD}/test-install-bin -PYTHONPATH=${BUILD}/test-install python setup.py --quiet install --install-lib ${BUILD}/test-install --install-scripts ${BUILD}/test-install-bin +PYTHONPATH=${BUILD}/test-install python3 setup.py --quiet install --install-lib ${BUILD}/test-install --install-scripts ${BUILD}/test-install-bin test -f ${BUILD}/test-install-bin/i3pystatus diff --git a/tests/test_core_modules.py b/tests/test_core_modules.py index 47d3cf5..84b40cb 100644 --- a/tests/test_core_modules.py +++ b/tests/test_core_modules.py @@ -11,7 +11,7 @@ class IntervalModuleMetaTest(unittest.TestCase): def test_no_settings(self): class NoSettings(IntervalModule): pass - self.assertEqual(NoSettings.settings, ('interval',)) + self.assertTrue('interval' in NoSettings.settings) def test_no_interval_setting(self): class NoIntervalSetting(IntervalModule):