Minor after-merge cleanup

[ci skip]
schmitts · Jan 28, 2016 · e3a94db · e3a94db
1 parent d7525ad
commit e3a94db
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,5 +28,9 @@ nosetests.xml
 .idea
 /Brian2.egg-info
 
+# vim files
+*.swp
+.rope*
+
 # IPython
 .ipynb_checkpoints
diff --git a/brian2/.gitignore b/brian2/.gitignore
@@ -1,4 +1 @@
 /default_preferences
-# Do not take into account RC temporary files
-*.swp
-.rope*
diff --git a/brian2/tests/test_spatialneuron.py b/brian2/tests/test_spatialneuron.py
@@ -532,11 +532,11 @@ def test_rall():
 
 if __name__ == '__main__':
     test_custom_events()
-    #test_construction()
-    #test_construction_coordinates()
-    #test_infinitecable()
-    #test_finitecable()
-    #test_rallpack1()
-    #test_rallpack2()
-    #test_rallpack3()
-    #test_rall()
+    test_construction()
+    test_construction_coordinates()
+    test_infinitecable()
+    test_finitecable()
+    test_rallpack1()
+    test_rallpack2()
+    test_rallpack3()
+    test_rall()