moved the test to conv where it makes more sense

theano/scan_module/tests/test_scan.py

@@ -2018,12 +2018,6 @@ class T_Scan(unittest.TestCase):
         if theano.config.mode != 'FAST_COMPILE':
             self.assertTrue(nb_shape_i == 1)
 
-    def test_bug_josh_reported(self):
-        import theano.tensor.signal.conv
-        m1 = theano.tensor.matrix()
-        m2 = theano.tensor.matrix()
-        conv = theano.tensor.signal.conv.conv2d(m1, m2)
-
     def test_merge(self):
         x = theano.tensor.vector()
         y = theano.tensor.vector()

theano/tensor/signal/tests/test_conv.py

@@ -97,3 +97,14 @@ class TestSignalConv2D(unittest.TestCase):
             self.fail()
         except:
             pass
+
+    def test_bug_josh_reported(self):
+        """
+        Test refers to a bug reported by Josh, when due to a bad merge these
+        few lines of code failed. See
+        http://groups.google.com/group/theano-dev/browse_thread/thread/8856e7ca5035eecb
+        """
+        m1 = theano.tensor.matrix()
+        m2 = theano.tensor.matrix()
+        rval = conv.conv2d(m1, m2)
+