diff options
Diffstat (limited to 'xnt/tests/taskmisctests.py')
| -rw-r--r-- | xnt/tests/taskmisctests.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/xnt/tests/taskmisctests.py b/xnt/tests/taskmisctests.py index 901d69c..45b374c 100644 --- a/xnt/tests/taskmisctests.py +++ b/xnt/tests/taskmisctests.py @@ -9,7 +9,7 @@ # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# This program is distributed in the hope that it will be useful, +# This program is distributed, 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. @@ -37,91 +37,91 @@ class TaskMiscTests(unittest.TestCase): """Test Echo Task""" result = __echo__(msg="foobar", tofile="mytestfile") assert_basic_assumptions(self, result) - self.assertTrue('msg' in result[0][1]) + self.assertIn('msg', result[0][1]) self.assertEqual('foobar', result[0][1]['msg']) - self.assertTrue('tofile' in result[0][1]) + self.assertIn('tofile', result[0][1]) self.assertEqual('mytestfile', result[0][1]['tofile']) def test_log(self): """Test log function""" result = __log__(msg="testing the logging", lvl=40) assert_basic_assumptions(self, result) - self.assertTrue('msg' in result[0][1]) + self.assertIn('msg', result[0][1]) self.assertEqual('testing the logging', result[0][1]['msg']) - self.assertTrue('lvl' in result[0][1]) + self.assertIn('lvl', result[0][1]) self.assertEqual(40, result[0][1]['lvl']) def test_call(self): """Test Call, testing redirection""" result = __call__(['echo', 'blah']) assert_basic_assumptions(self, result) - self.assertTrue('command' in result[0][1]) + self.assertIn('command', result[0][1]) self.assertEqual(2, len(result[0][1]['command'])) self.assertEqual('echo', result[0][1]['command'][0]) self.assertEqual('blah', result[0][1]['command'][1]) - self.assertTrue('stdout' in result[0][1]) + self.assertIn('stdout', result[0][1]) self.assertIsNone(result[0][1]['stdout']) - self.assertTrue('stderr' in result[0][1]) + self.assertIn('stderr', result[0][1]) self.assertIsNone(result[0][1]['stderr']) - self.assertTrue('path' in result[0][1]) + self.assertIn('path', result[0][1]) self.assertIsNone(result[0][1]['path']) def test_setup_with_single_command(self): '''Test setup function with a single command''' result = __setup__(command='test') assert_basic_assumptions(self, result) - self.assertTrue('commands' in result[0][1]) + self.assertIn('commands', result[0][1]) self.assertEqual(1, len(result[0][1]['commands'])) def test_setup_with_commands(self): '''Test setup function commands''' result = __setup__(commands=['build', 'test']) assert_basic_assumptions(self, result) - self.assertTrue('commands' in result[0][1]) + self.assertIn('commands', result[0][1]) self.assertEqual(2, len(result[0][1]['commands'])) def test_setup_with_directory(self): '''Test setup function with directory''' result = __setup__(command='test', directory='test/') assert_basic_assumptions(self, result) - self.assertTrue('directory' in result[0][1]) + self.assertIn('directory', result[0][1]) self.assertEqual('test/', result[0][1]['directory']) def test_xntcall(self): """Test xntcall""" result = __xntcall__(buildfile='test/build.py') assert_basic_assumptions(self, result) - self.assertTrue('buildfile' in result[0][1]) + self.assertIn('buildfile', result[0][1]) self.assertEqual('test/build.py', result[0][1]['buildfile']) - self.assertTrue('targets' in result[0][1]) - self.assertTrue('props' in result[0][1]) + self.assertIn('targets', result[0][1]) + self.assertIn('props', result[0][1]) def test_xnt_list_targets(self): '''Test xnt list targets''' result = __xnt_list_targets__('./build.py') assert_basic_assumptions(self, result) - self.assertTrue('buildfile' in result[0][1]) + self.assertIn('buildfile', result[0][1]) self.assertEqual('./build.py', result[0][1]['buildfile']) def test_expandpath(self): '''Test expandpath''' result = __expandpath__('./**.pyc') assert_basic_assumptions(self, result) - self.assertTrue('path_pattern', result[0][1]) + self.assertIn('path_pattern', result[0][1]) self.assertEqual('./**.pyc', result[0][1]['path_pattern']) def test_which(self): """Test which""" result = __which__('python') assert_basic_assumptions(self, result) - self.assertTrue('program' in result[0][1]) + self.assertIn('program', result[0][1]) self.assertEqual('python', result[0][1]['program']) def test_in_path(self): """Test in_path task""" result = __in_path__('python') assert_basic_assumptions(self, result) - self.assertTrue('program' in result[0][1]) + self.assertIn('program', result[0][1]) self.assertEqual('python', result[0][1]['program']) if __name__ == "__main__": |