Merge remote-tracking branch 'origin/master'

README.rst

@@ -34,4 +34,19 @@ Please use our all-in-one installer.
 Mac OS X
 --------
 
-Please use our DMG package.
+Please use our DMG package for a simple installation.
+
+
+If you want to test the current git version or contribute to the project.
+
+You can follow this instructions with virtualenwrapper: http://virtualenvwrapper.readthedocs.org/
+and homebrew: http://brew.sh/.
+
+.. code:: bash
+
+   brew install python3
+   mkvirtualenv gns3-server --python=/usr/local/bin/python3.4
+   python3 setup.py install
+   gns3server
+
+

tests/dynamips/test_c7200.py

@@ -29,9 +29,9 @@ def test_router_exists(router_c7200):
 
 def test_npe(router_c7200):
 
-    assert router_c7200.npe == "npe-200"  # default value
-    router_c7200.npe = "npe-400"
-    assert router_c7200.npe == "npe-400"
+    assert router_c7200.npe == "npe-400"  # default value
+    router_c7200.npe = "npe-200"
+    assert router_c7200.npe == "npe-200"
 
 
 def test_midplane(router_c7200):