# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 1279114754 -7200 # Node ID c2d606a1dc6f7fe1e64860e81ca068264c7f2bf6 # Parent 67513cca972fbbe7080aa0383e7f5013b461268c tests: get rid of DOS line endings. diff --git a/tests/test_push_eol.py b/tests/test_push_eol.py --- a/tests/test_push_eol.py +++ b/tests/test_push_eol.py @@ -1,42 +1,42 @@ -import unittest - -import test_util - -class TestPushEol(test_util.TestBase): - def setUp(self): - test_util.TestBase.setUp(self) - test_util.load_fixture_and_fetch('emptyrepo.svndump', - self.repo_path, - self.wc_path) - - def _test_push_dirs(self, stupid): - changes = [ - # Root files with LF, CRLF and mixed EOL - ('lf', 'lf', 'a\nb\n\nc'), - ('crlf', 'crlf', 'a\r\nb\r\n\r\nc'), - ('mixed', 'mixed', 'a\r\nb\n\r\nc\nd'), - ] - self.commitchanges(changes) - self.pushrevisions(stupid) - self.assertchanges(changes, self.repo['tip']) - - changes = [ - # Update all files once, with same EOL - ('lf', 'lf', 'a\nb\n\nc\na\nb\n\nc'), - ('crlf', 'crlf', 'a\r\nb\r\n\r\nc\r\na\r\nb\r\n\r\nc'), - ('mixed', 'mixed', 'a\r\nb\n\r\nc\nd\r\na\r\nb\n\r\nc\nd'), - ] - self.commitchanges(changes) - self.pushrevisions(stupid) - self.assertchanges(changes, self.repo['tip']) - - def test_push_dirs(self): - self._test_push_dirs(False) - - def test_push_dirs_stupid(self): - self._test_push_dirs(True) - -def suite(): - all = [unittest.TestLoader().loadTestsFromTestCase(TestPushEol), - ] - return unittest.TestSuite(all) +import unittest + +import test_util + +class TestPushEol(test_util.TestBase): + def setUp(self): + test_util.TestBase.setUp(self) + test_util.load_fixture_and_fetch('emptyrepo.svndump', + self.repo_path, + self.wc_path) + + def _test_push_dirs(self, stupid): + changes = [ + # Root files with LF, CRLF and mixed EOL + ('lf', 'lf', 'a\nb\n\nc'), + ('crlf', 'crlf', 'a\r\nb\r\n\r\nc'), + ('mixed', 'mixed', 'a\r\nb\n\r\nc\nd'), + ] + self.commitchanges(changes) + self.pushrevisions(stupid) + self.assertchanges(changes, self.repo['tip']) + + changes = [ + # Update all files once, with same EOL + ('lf', 'lf', 'a\nb\n\nc\na\nb\n\nc'), + ('crlf', 'crlf', 'a\r\nb\r\n\r\nc\r\na\r\nb\r\n\r\nc'), + ('mixed', 'mixed', 'a\r\nb\n\r\nc\nd\r\na\r\nb\n\r\nc\nd'), + ] + self.commitchanges(changes) + self.pushrevisions(stupid) + self.assertchanges(changes, self.repo['tip']) + + def test_push_dirs(self): + self._test_push_dirs(False) + + def test_push_dirs_stupid(self): + self._test_push_dirs(True) + +def suite(): + all = [unittest.TestLoader().loadTestsFromTestCase(TestPushEol), + ] + return unittest.TestSuite(all) diff --git a/tests/test_svnwrap.py b/tests/test_svnwrap.py --- a/tests/test_svnwrap.py +++ b/tests/test_svnwrap.py @@ -12,10 +12,10 @@ from hgsubversion import svnwrap import os import stat def force_rm(path): - os.chmod( - path, - os.stat(path).st_mode | stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH - ) + os.chmod( + path, + os.stat(path).st_mode | stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH + ) os.remove(path) class TestBasicRepoLayout(unittest.TestCase):