use switch_expected where needed

greentest/test__greenlet.py

@@ -129,6 +129,7 @@ class TestLink(greentest.TestCase):
 
 
 class TestUnlink(greentest.TestCase):
+    switch_expected = False
 
     def setUp(self):
         greentest.TestCase.setUp(self)
@@ -484,6 +485,7 @@ class A(object):
 hexobj = re.compile('0x[0123456789abcdef]+')
 
 class TestStr(greentest.TestCase):
+    switch_expected = False
 
     def test(self):
         g1 = gevent.Greenlet(test_func)

greentest/test__timeout.py

@@ -3,7 +3,8 @@ import gevent
 DELAY = 0.01
 
 
-class Test(greentest.TestCase):
+class TestDirectRaise(greentest.TestCase):
+    switch_expected = False
 
     def test_direct_raise_class(self):
         try:
@@ -19,6 +20,8 @@ class Test(greentest.TestCase):
             assert timeout is t, (timeout, t)
             assert not t.pending, repr(t)
 
+class Test(greentest.TestCase):
+
     def test_with_timeout(self):
         self.assertRaises(gevent.Timeout, gevent.with_timeout, DELAY, gevent.sleep, DELAY*2)
         X = object()