Mercurial > hgsubversion

changeset 642:c2d606a1dc6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: get rid of DOS line endings.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Wed, 14 Jul 2010 15:39:14 +0200
parents 67513cca972f
children d2ef7220a079
files tests/test_push_eol.py tests/test_svnwrap.py
diffstat 2 files changed, 46 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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):