From d9856db46f6ff5ab71a367b70bcf469c168fbd38 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Sat, 2 Jun 2012 05:20:12 +0900
Subject: [PATCH] discard sample/test_simple_switch because of unittest fail

unittest crashes on commit e5e4b8442:

ERROR: testInit (ryu.tests.unit.sample.test_simple_switch.TestSimpleSwitch)

Traceback (most recent call last):
  File "/var/lib/jenkins/jobs/ryu-test-upstream/workspace/ryu/tests/unit/sample/test_simple_switch.py", line 20, in testInit
    ss = SimpleSwitch()
  File "/var/lib/jenkins/jobs/ryu-test-upstream/workspace/ryu/app/simple_switch.py", line 44, in __init__
    self.mac2port = kwargs['mac2port']
KeyError: 'mac2port'

The simple_switch unittest doesn't test anything anyway so let's
remove it for now.

This also fixes a pip8 error of simple_switch.py that the commit
e5e4b8442 added.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 ryu/app/simple_switch.py                    |  1 +
 ryu/tests/unit/sample/test_simple_switch.py | 21 ---------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 ryu/tests/unit/sample/test_simple_switch.py

diff --git a/ryu/app/simple_switch.py b/ryu/app/simple_switch.py
index dce8fd7e..16f26b99 100644
--- a/ryu/app/simple_switch.py
+++ b/ryu/app/simple_switch.py
@@ -39,6 +39,7 @@ class SimpleSwitch(app_manager.RyuApp):
     _CONTEXTS = {
         'mac2port': mac_to_port.MacToPortTable,
         }
+
     def __init__(self, *args, **kwargs):
         super(SimpleSwitch, self).__init__(*args, **kwargs)
         self.mac2port = kwargs['mac2port']
diff --git a/ryu/tests/unit/sample/test_simple_switch.py b/ryu/tests/unit/sample/test_simple_switch.py
deleted file mode 100644
index 5fb76304..00000000
--- a/ryu/tests/unit/sample/test_simple_switch.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-import unittest
-from nose.tools import ok_, eq_
-
-from ryu.app.simple_switch import SimpleSwitch
-
-import logging
-LOG = logging.getLogger(__name__)
-
-
-class TestSimpleSwitch(unittest.TestCase):
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testInit(self):
-        ss = SimpleSwitch()
-        ok_(True)