Abhilash Raj has proposed merging lp:~raj-abhilash1/mailman/bugfix into 
lp:mailman.

Requested reviews:
  Mailman Coders (mailman-coders)

For more details, see:
https://code.launchpad.net/~raj-abhilash1/mailman/bugfix/+merge/256569

Add test case for the falcon bug.
-- 
Your team Mailman Coders is requested to review the proposed merge of 
lp:~raj-abhilash1/mailman/bugfix into lp:mailman.
=== modified file 'src/mailman/rest/tests/test_listconf.py'
--- src/mailman/rest/tests/test_listconf.py	2015-04-15 18:36:28 +0000
+++ src/mailman/rest/tests/test_listconf.py	2015-04-16 20:54:17 +0000
@@ -91,6 +91,7 @@
         # All three acceptable aliases were set.
         self.assertEqual(set(IAcceptableAliasSet(self._mlist).aliases),
                          set(aliases))
+<<<<<<< TREE
 
     def test_patch_subscription_policy(self):
         # The new subscription_policy value can be patched.
@@ -108,3 +109,14 @@
         # And now we verify that it has the requested setting.
         self.assertEqual(self._mlist.subscription_policy,
                          SubscriptionPolicy.confirm_then_moderate)
+=======
+
+    @unittest.expectedFailure
+    def test_bad_description_update(self):
+        resource, response = call_api(
+            'http://localhost:9001/3.0/lists/[email protected]/config',
+            dict(description='A description with , to check stuff'), 'PATCH')
+        self.assertEqual(response.status, 204)
+        self.assertEqual(self._mlist.description,
+                         'A description with , to check stuff')
+>>>>>>> MERGE-SOURCE

_______________________________________________
Mailman-coders mailing list
[email protected]
https://mail.python.org/mailman/listinfo/mailman-coders

Reply via email to