From 04f670cb5069338f9ea9ffe4b67d0c798043245c Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Sat, 27 Sep 2014 19:56:45 +0200 Subject: [PATCH 1/2] Instruction for development on MacOS X --- README.rst | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d733fa63..8713028e 100644 --- a/README.rst +++ b/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 + + From 20dc779fd8a9668e4e546b2c198dccc1f0023fc7 Mon Sep 17 00:00:00 2001 From: Daniel Lintott Date: Sat, 27 Sep 2014 19:27:26 +0100 Subject: [PATCH 2/2] Fix test for dynamips c7200 NPE (Default is now NPE-400) --- tests/dynamips/test_c7200.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/dynamips/test_c7200.py b/tests/dynamips/test_c7200.py index ed5df69e..7b74cc7f 100644 --- a/tests/dynamips/test_c7200.py +++ b/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):