Title: [91724] trunk/Tools
- Revision
- 91724
- Author
- [email protected]
- Date
- 2011-07-25 16:56:52 -0700 (Mon, 25 Jul 2011)
Log Message
Ignore line endings in ChangeLogTests
https://bugs.webkit.org/show_bug.cgi?id=64956
Reviewed by Adam Barth.
Split the lines of the ChangeLog text before comparing them.
This fixes 3 tests on windows, since only the content importent.
* Scripts/webkitpy/common/checkout/changelog_unittest.py:
* Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91723 => 91724)
--- trunk/Tools/ChangeLog 2011-07-25 23:40:16 UTC (rev 91723)
+++ trunk/Tools/ChangeLog 2011-07-25 23:56:52 UTC (rev 91724)
@@ -1,3 +1,16 @@
+2011-07-25 Patrick Gansterer <[email protected]>
+
+ Ignore line endings in ChangeLogTests
+ https://bugs.webkit.org/show_bug.cgi?id=64956
+
+ Reviewed by Adam Barth.
+
+ Split the lines of the ChangeLog text before comparing them.
+ This fixes 3 tests on windows, since only the content importent.
+
+ * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+ * Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
+
2011-07-25 Adam Barth <[email protected]>
Add some debug logging to NRWT to diagnose why the windows bots can't determine their SVN revision
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (91723 => 91724)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2011-07-25 23:40:16 UTC (rev 91723)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2011-07-25 23:56:52 UTC (rev 91724)
@@ -201,7 +201,7 @@
actual_contents = self._read_file_contents(changelog_path, "utf-8")
expected_contents = changelog_contents.replace('NOBODY (OOPS!)', reviewer_name)
os.remove(changelog_path)
- self.assertEquals(actual_contents, expected_contents)
+ self.assertEquals(actual_contents.splitlines(), expected_contents.splitlines())
def test_set_short_description_and_bug_url(self):
changelog_contents = u"%s\n%s" % (self._new_entry_boilerplate, self._example_changelog)
@@ -213,4 +213,4 @@
expected_message = "%s\n %s" % (short_description, bug_url)
expected_contents = changelog_contents.replace("Need a short description and bug URL (OOPS!)", expected_message)
os.remove(changelog_path)
- self.assertEquals(actual_contents, expected_contents)
+ self.assertEquals(actual_contents.splitlines(), expected_contents.splitlines())
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py (91723 => 91724)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2011-07-25 23:40:16 UTC (rev 91723)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2011-07-25 23:56:52 UTC (rev 91724)
@@ -51,4 +51,4 @@
expected_message = "Example title\n http://example.com/1234"
expected_contents = changelog_contents.replace("Need a short description and bug URL (OOPS!)", expected_message)
os.remove(changelog_path)
- self.assertEquals(actual_contents, expected_contents)
+ self.assertEquals(actual_contents.splitlines(), expected_contents.splitlines())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
