add two additional cases and add tests for all

execption raising cases

Author: evanmcc

riak/mapreduce.py

@@ -83,14 +83,14 @@ def add_bucket(self, bucket):
 
     def add_key_filters(self, key_filters):
         if self._input_mode == 'query':
-            raise Exception('Key filters are not supported in a query.')
+            raise ValueError('Key filters are not supported in a query.')
 
         self._key_filters.extend(key_filters)
         return self
 
     def add_key_filter(self, *args):
         if self._input_mode == 'query':
-            raise Exception('Key filters are not supported in a query.')
+            raise ValueError('Key filters are not supported in a query.')
 
         self._key_filters.append(args)
         return self

riak/tests/test_mapreduce.py

@@ -83,6 +83,27 @@ def test_erlang_map_reduce(self):
             .run()
         self.assertEqual(len(result), 2)
 
+    def test_client_exceptional_paths(self):
+        bucket = self.client.bucket('bucket')
+        bucket.new("foo", 2).store()
+        bucket.new("bar", 2).store()
+        bucket.new("baz", 4).store()
+
+        #adding a b-key pair to a bucket input
+        with self.assertRaises(ValueError):
+            mr = self.client.add('bucket')
+            mr.add('bucket', 'bar')
+
+        #adding a b-key pair to a query input
+        with self.assertRaises(ValueError):
+            mr = self.client.search('bucket', 'fleh')
+            mr.add('bucket', 'bar')
+
+        #adding a key filter to a query input
+        with self.assertRaises(ValueError):
+            mr = self.client.search('bucket', 'fleh')
+            mr.add_key_filter("tokenize", "-", 1)
+ 
 
 class JSMapReduceTests(object):
     def test_javascript_source_map(self):