Fix gmerge tests to work again.
BUG=chromium-os:16062
TEST=Verify gmerge tests work again.
Change-Id: I2bee2e70de0e16e6236a61778c28c82461f0d0c0
Reviewed-on: http://gerrit.chromium.org/gerrit/1981
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Tested-by: David James <davidjames@chromium.org>
diff --git a/gmerge_test.py b/gmerge_test.py
index c65d631..833b7df 100755
--- a/gmerge_test.py
+++ b/gmerge_test.py
@@ -33,11 +33,14 @@
old_env = os.environ
os.environ = {}
os.environ['USE'] = 'a b c d +e'
- gmerge.FLAGS = Flags({'accept_stable': 'blah'})
+ gmerge.FLAGS = Flags({'accept_stable': 'blah',
+ 'deep': False,
+ 'usepkg': False})
merger = gmerge.GMerger(self.lsb_release_lines)
self.assertEqual(
- 'use=a+b+c+d+%2Be&pkg=package_name&board=x86-mario&accept_stable=blah',
+ 'use=a+b+c+d+%2Be&board=x86-mario&deep=&pkg=package_name&usepkg=&'
+ 'accept_stable=blah',
merger.GeneratePackageRequest('package_name'))
os.environ = old_env