Restore

gregmalcolm · gregmalcolm · commit 34c14449c4cf · 2013-04-28T23:03:07.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ script:
     - PYTHON_VER=`python -c 'import sys; print(sys.version_info[0])'`
     - cd python$PYTHON_VER
     - python _runner_tests.py
-    - python contemplate_koans.py about_asserts                         # Run all the koans
+#   - python contemplate_koans.py                          # Run all the koans
 #   - python contemplate_koans.py about_asserts about_none # Run a subset of
 #                                                          # koans
 #
diff --git a/python2/koans/about_asserts.py b/python2/koans/about_asserts.py
@@ -10,42 +10,42 @@ def test_assert_truth(self):
         """
         We shall contemplate truth by testing reality, via asserts.
         """
-        self.assertTrue(True)  # This should be true
-
-    #def test_assert_with_message(self):
-        #"""
-        #Enlightenment may be more easily achieved with appropriate messages.
-        #"""
-        #self.assertTrue(False, "This should be true -- Please fix this")
-
-    #def test_fill_in_values(self):
-        #"""
-        #Sometimes we will ask you to fill in the values
-        #"""
-        #self.assertEqual(__, 1 + 1)
-
-    #def test_assert_equality(self):
-        #"""
-        #To understand reality, we must compare our expectations against
-        #reality.
-        #"""
-        #expected_value = __
-        #actual_value = 1 + 1
-        #self.assertTrue(expected_value == actual_value)
-
-    #def test_a_better_way_of_asserting_equality(self):
-        #"""
-        #Some ways of asserting equality are better than others.
-        #"""
-        #expected_value = __
-        #actual_value = 1 + 1
-
-        #self.assertEqual(expected_value, actual_value)
-
-    #def test_that_unittest_asserts_work_the_same_way_as_python_asserts(self):
-        #"""
-        #Knowing how things really work is half the battle
-        #"""
-
-        ## This throws an AssertionError exception
-        #assert False
+        self.assertTrue(False)  # This should be true
+
+    def test_assert_with_message(self):
+        """
+        Enlightenment may be more easily achieved with appropriate messages.
+        """
+        self.assertTrue(False, "This should be true -- Please fix this")
+
+    def test_fill_in_values(self):
+        """
+        Sometimes we will ask you to fill in the values
+        """
+        self.assertEqual(__, 1 + 1)
+
+    def test_assert_equality(self):
+        """
+        To understand reality, we must compare our expectations against
+        reality.
+        """
+        expected_value = __
+        actual_value = 1 + 1
+        self.assertTrue(expected_value == actual_value)
+
+    def test_a_better_way_of_asserting_equality(self):
+        """
+        Some ways of asserting equality are better than others.
+        """
+        expected_value = __
+        actual_value = 1 + 1
+
+        self.assertEqual(expected_value, actual_value)
+
+    def test_that_unittest_asserts_work_the_same_way_as_python_asserts(self):
+        """
+        Knowing how things really work is half the battle
+        """
+
+        # This throws an AssertionError exception
+        assert False
diff --git a/python2/runner/runner_tests/test_sensei.py b/python2/runner/runner_tests/test_sensei.py
@@ -317,4 +317,4 @@ def test_total_koans_return_43_if_there_are_43_test_cases(self):
     def test_filter_all_lessons_will_discover_test_classes_if_none_have_been_discovered_yet(self):
         self.sensei.all_lessons = 0
         self.assertTrue(len(self.sensei.filter_all_lessons()) > 10)
-        self.assertTrue(len(self.sensei.all_lessons) < 10)
+        self.assertTrue(len(self.sensei.all_lessons) > 10)

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ script:`
`10`	`10`	- PYTHON_VER=`python -c 'import sys; print(sys.version_info[0])'`
`11`	`11`	`- cd python$PYTHON_VER`
`12`	`12`	`- python _runner_tests.py`
`13`		`- - python contemplate_koans.py about_asserts # Run all the koans`
	`13`	`+# - python contemplate_koans.py # Run all the koans`
`14`	`14`	`# - python contemplate_koans.py about_asserts about_none # Run a subset of`
`15`	`15`	`# # koans`
`16`	`16`	`#`