Options cleanup, enforce nohooks and deps_os are always defined.

tests/gclient_smoketest.py

Index: tests/gclient_smoketest.py
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index b89f16ca034caff5cb2fbe4c14a618f7d9eaacfc..713d7ff30485777f271923c7323865a48c09824a 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -119,13 +119,15 @@ class GClientSmoke(GClientSmokeBase):
   def testHelp(self):
     """testHelp: make sure no new command was added."""
     result = self.gclient(['help'])
-    self.assertEquals(1197, len(result[0]))
+    # Roughly, not too short, not too long.
+    self.assertTrue(1000 < len(result[0]) and len(result[0]) < 2000)
     self.assertEquals(0, len(result[1]))
     self.assertEquals(0, result[2])
 
   def testUnknown(self):
     result = self.gclient(['foo'])
-    self.assertEquals(1197, len(result[0]))
+    # Roughly, not too short, not too long.
+    self.assertTrue(1000 < len(result[0]) and len(result[0]) < 2000)
     self.assertEquals(0, len(result[1]))
     self.assertEquals(0, result[2])