Change query string tests

There is a difference between how urlparse handles if it is a protocol
it recognises vs a general URI. This only seems to exist on pypy and
py2.6.

This is not something that should be managed by us. Let it be handled by
the standard urlparse mechanism.

requests_mock/tests/test_adapter.py

@@ -351,17 +351,6 @@ def test_called_and_called_count(self):
         self.assertEqual(len(resps), self.adapter.call_count)
         self.assertTrue(self.adapter.called)
 
-    def test_query_string(self):
-        qs = 'a=1&b=2'
-        self.adapter.register_uri('GET', self.url, text='resp')
-        resp = self.session.get("%s?%s" % (self.url, qs))
-
-        self.assertEqual('resp', resp.text)
-
-        self.assertEqual(qs, self.adapter.last_request.query)
-        self.assertEqual(['1'], self.adapter.last_request.qs['a'])
-        self.assertEqual(['2'], self.adapter.last_request.qs['b'])
-
     def test_adapter_picks_correct_adatper(self):
         good = '%s://test3.url/' % self.PREFIX
         self.adapter.register_uri('GET',

requests_mock/tests/test_mocker.py

@@ -80,6 +80,19 @@ def inner(m):
         inner()
         self.assertMockStopped()
 
+    @requests_mock.mock()
+    def test_query_string(self, m):
+        url = 'http://test.url/path'
+        qs = 'a=1&b=2'
+        m.register_uri('GET', url, text='resp')
+        resp = requests.get("%s?%s" % (url, qs))
+
+        self.assertEqual('resp', resp.text)
+
+        self.assertEqual(qs, m.last_request.query)
+        self.assertEqual(['1'], m.last_request.qs['a'])
+        self.assertEqual(['2'], m.last_request.qs['b'])
+
 
 class MockerHttpMethodsTests(base.TestCase):