diff tests/test_push_eol.py @ 1106:5cb6c95e0283 stable

Merge default and stable so I can do stable releases again.
author Augie Fackler <raf@durin42.com>
date Tue, 11 Feb 2014 12:48:49 -0500
parents 23992b41b6b7
children
line wrap: on
line diff
--- a/tests/test_push_eol.py
+++ b/tests/test_push_eol.py
@@ -3,11 +3,14 @@ import test_util
 import unittest
 
 class TestPushEol(test_util.TestBase):
+    obsolete_mode_tests = True
+    stupid_mode_tests = True
+
     def setUp(self):
         test_util.TestBase.setUp(self)
         self._load_fixture_and_fetch('emptyrepo.svndump')
 
-    def _test_push_dirs(self, stupid):
+    def test_push_dirs(self):
         changes = [
             # Root files with LF, CRLF and mixed EOL
             ('lf', 'lf', 'a\nb\n\nc'),
@@ -15,7 +18,7 @@ class TestPushEol(test_util.TestBase):
             ('mixed', 'mixed', 'a\r\nb\n\r\nc\nd'),
             ]
         self.commitchanges(changes)
-        self.pushrevisions(stupid)
+        self.pushrevisions()
         self.assertchanges(changes, self.repo['tip'])
 
         changes = [
@@ -25,16 +28,5 @@ class TestPushEol(test_util.TestBase):
             ('mixed', 'mixed', 'a\r\nb\n\r\nc\nd\r\na\r\nb\n\r\nc\nd'),
             ]
         self.commitchanges(changes)
-        self.pushrevisions(stupid)
+        self.pushrevisions()
         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_tests = [unittest.TestLoader().loadTestsFromTestCase(TestPushEol),
-          ]
-    return unittest.TestSuite(all_tests)