If an end-user has configured a local gitweb source or kernel mirrors, this can lead to the unittest failing, because the tests assume the settings are the default ones (for comparison to the expected results). Fix this by overriding the settings values with the default ones. Without this change, the unittest always fails with local gitweb/mirror configuration.
Signed-off-by: Nishanth Aravamudan <[email protected]> diff --git a/client/kernelexpand_unittest.py b/client/kernelexpand_unittest.py index 8b8057f..ffeca29 100755 --- a/client/kernelexpand_unittest.py +++ b/client/kernelexpand_unittest.py @@ -26,6 +26,9 @@ mirrorA = [ class kernelexpandTest(unittest.TestCase): def setUp(self): self.god = mock.mock_god(ut=self) + settings.override_value('CLIENT', 'kernel_mirror', km) + settings.override_value('CLIENT', 'kernel_gitweb', '') + settings.override_value('CLIENT', 'stable_kernel_gitweb', '') def tearDown(self): @@ -97,20 +100,16 @@ class kernelexpandTest(unittest.TestCase): def test_decompose_gitweb(self): - self.god.stub_function(settings, "get_value") - settings.get_value.expect_call('CLIENT', 'kernel_mirror', default='').and_return(km) - settings.get_value.expect_call('CLIENT', 'kernel_gitweb', default='').and_return(gw) - settings.get_value.expect_call('CLIENT', 'stable_kernel_gitweb', default='').and_return(sgw) + settings.override_value('CLIENT', 'kernel_gitweb', gw) + settings.override_value('CLIENT', 'stable_kernel_gitweb', sgw) correct = [ [ km + 'v3.x/linux-3.0.tar.bz2', gw + ';a=snapshot;h=refs/tags/v3.0;sf=tgz' ] ] sample = decompose_kernel('3.0') self.assertEqual(sample, correct) def test_decompose_sha1(self): - self.god.stub_function(settings, "get_value") - settings.get_value.expect_call('CLIENT', 'kernel_mirror', default='').and_return(km) - settings.get_value.expect_call('CLIENT', 'kernel_gitweb', default='').and_return(gw) - settings.get_value.expect_call('CLIENT', 'stable_kernel_gitweb', default='').and_return(sgw) + settings.override_value('CLIENT', 'kernel_gitweb', gw) + settings.override_value('CLIENT', 'stable_kernel_gitweb', sgw) correct = [ [ gw + ';a=snapshot;h=02f8c6aee8df3cdc935e9bdd4f2d020306035dbe;sf=tgz', sgw + ';a=snapshot;h=02f8c6aee8df3cdc935e9bdd4f2d020306035dbe;sf=tgz' ] ] sample = decompose_kernel('02f8c6aee8df3cdc935e9bdd4f2d020306035dbe') self.assertEqual(sample, correct) _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
