From 85246779927bdfbaa2bb6c84eb4233f8d4585f23 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 22 Apr 2015 10:03:39 -0400 Subject: [PATCH] Update paver tests to ignore trailing whitespace --- pavelib/paver_tests/test_paver_bok_choy_cmds.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py index 964117cbb6..90a8269d6e 100644 --- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py +++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py @@ -22,36 +22,36 @@ class TestPaverBokChoyCmd(unittest.TestCase): "nosetests {repo_dir}/common/test/acceptance/tests{exp_text} " "--with-xunit " "--xunit-file={repo_dir}/reports/bok_choy/xunit.xml " - "--verbosity=2 " + "--verbosity=2" ).format( default_store=expected_default_store, repo_dir=REPO_DIR, exp_text=expected_text_append, ) - return expected_statement + return expected_statement.strip() def test_default_bokchoy(self): - self.assertEqual(self.request.cmd, self._expected_command('')) + self.assertEqual(self.request.cmd.strip(), self._expected_command('')) def test_suite_request_bokchoy(self): self.request.test_spec = "test_foo.py" - self.assertEqual(self.request.cmd, self._expected_command(self.request.test_spec)) + self.assertEqual(self.request.cmd.strip(), self._expected_command(self.request.test_spec)) def test_class_request_bokchoy(self): self.request.test_spec = "test_foo.py:FooTest" - self.assertEqual(self.request.cmd, self._expected_command(self.request.test_spec)) + self.assertEqual(self.request.cmd.strip(), self._expected_command(self.request.test_spec)) def test_case_request_bokchoy(self): self.request.test_spec = "test_foo.py:FooTest.test_bar" - self.assertEqual(self.request.cmd, self._expected_command(self.request.test_spec)) + self.assertEqual(self.request.cmd.strip(), self._expected_command(self.request.test_spec)) def test_default_bokchoy_with_draft_default_store(self): self.request.test_spec = "test_foo.py" self.request.default_store = "draft" - self.assertEqual(self.request.cmd, self._expected_command(self.request.test_spec, "draft")) + self.assertEqual(self.request.cmd.strip(), self._expected_command(self.request.test_spec, "draft")) def test_default_bokchoy_with_invalid_default_store(self): # the cmd will dumbly compose whatever we pass in for the default_store self.request.test_spec = "test_foo.py" self.request.default_store = "invalid" - self.assertEqual(self.request.cmd, self._expected_command(self.request.test_spec, "invalid")) + self.assertEqual(self.request.cmd.strip(), self._expected_command(self.request.test_spec, "invalid"))