Signed-off-by: YAMAMOTO Takashi <[email protected]> --- ryu/tests/unit/cmd/dummy_openflow_app.py | 22 ++++++++++++++++++++++ ryu/tests/unit/cmd/test_manager.py | 23 +++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 ryu/tests/unit/cmd/dummy_openflow_app.py
diff --git a/ryu/tests/unit/cmd/dummy_openflow_app.py b/ryu/tests/unit/cmd/dummy_openflow_app.py new file mode 100644 index 0000000..614febc --- /dev/null +++ b/ryu/tests/unit/cmd/dummy_openflow_app.py @@ -0,0 +1,22 @@ +# Copyright (C) 2013,2014 Nippon Telegraph and Telephone Corporation. +# Copyright (C) 2013,2014 YAMAMOTO Takashi <yamamoto at valinux co jp> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from ryu.base import app_manager +from ryu.ofproto import ofproto_v1_3 + + +class DummyOpenFlowApp(app_manager.RyuApp): + OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION] diff --git a/ryu/tests/unit/cmd/test_manager.py b/ryu/tests/unit/cmd/test_manager.py index 5c922a1..84c67c2 100644 --- a/ryu/tests/unit/cmd/test_manager.py +++ b/ryu/tests/unit/cmd/test_manager.py @@ -1,5 +1,5 @@ -# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation. -# Copyright (C) 2013 YAMAMOTO Takashi <yamamoto at valinux co jp> +# Copyright (C) 2013,2014 Nippon Telegraph and Telephone Corporation. +# Copyright (C) 2013,2014 YAMAMOTO Takashi <yamamoto at valinux co jp> # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -45,7 +45,26 @@ class Test_Manager(unittest.TestCase): def test_help(self): main() + @staticmethod + def _reset_globals(): + # hack to reset globals like SERVICE_BRICKS. + # assumption: this is the only test which actually starts RyuApp. + import ryu.base.app_manager + import ryu.ofproto.ofproto_protocol + + reload(ryu.base.app_manager) + reload(ryu.ofproto.ofproto_protocol) + @mock.patch('sys.argv', new=['ryu-manager', '--verbose', 'ryu.tests.unit.cmd.dummy_app']) def test_no_services(self): + self._reset_globals() + main() + self._reset_globals() + + @mock.patch('sys.argv', new=['ryu-manager', '--verbose', + 'ryu.tests.unit.cmd.dummy_openflow_app']) + def test_openflow_app(self): + self._reset_globals() main() + self._reset_globals() -- 1.8.3.1 ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
