Rev 4875: Change the TIOCGWINSZ test to use a _ModuleFeature. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-imports

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-imports

------------------------------------------------------------
revno: 4875
revision-id: john at arbash-meinel.com-20091208192348-wsi9a15a061tj3xk
parent: john at arbash-meinel.com-20091208191951-ekhcv011dyalvnru
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-test-imports
timestamp: Tue 2009-12-08 13:23:48 -0600
message:
  Change the TIOCGWINSZ test to use a _ModuleFeature.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2009-12-04 10:09:11 +0000
+++ b/bzrlib/tests/test_osutils.py	2009-12-08 19:23:48 +0000
@@ -23,7 +23,6 @@
 import socket
 import stat
 import sys
-import termios
 import time
 
 from bzrlib import (
@@ -54,6 +53,8 @@
 
 UTF8DirReaderFeature = _UTF8DirReaderFeature()
 
+TermIOSFeature = tests._ModuleFeature('termios')
+
 
 def _already_unicode(s):
     return s
@@ -1961,20 +1962,20 @@
         sys.stdout = None
         self.assertEquals(None, osutils.terminal_width())
 
-    def test_TIOCGWINSZ(self):
+    def test_no_TIOCGWINSZ(self):
+        self.requireFeature(TermIOSFeature)
+        termios = TermIOSFeature.module
         # bug 63539 is about a termios without TIOCGWINSZ attribute
-        exist = True
         try:
             orig = termios.TIOCGWINSZ
         except AttributeError:
-            exist = False
-
-        def restore():
-            if exist:
+            # We won't remove TIOCGWINSZ, because it doesn't exist anyway :)
+            pass
+        else:
+            def restore():
                 termios.TIOCGWINSZ = orig
-        self.addCleanup(restore)
-
-        del termios.TIOCGWINSZ
+            self.addCleanup(restore)
+            del termios.TIOCGWINSZ
         del os.environ['BZR_COLUMNS']
         del os.environ['COLUMNS']
-        self.assertEquals(None, osutils.terminal_width())
+        self.assertIs(None, osutils.terminal_width())