Instead of duplicating the check for should_load_modules(), move it to a reload_modules_if_needed() method.
Signed-off-by: Eduardo Habkost <[email protected]> --- client/tests/kvm/kvm/installer.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/tests/kvm/kvm/installer.py b/client/tests/kvm/kvm/installer.py index 1ee7050..2623ad7 100644 --- a/client/tests/kvm/kvm/installer.py +++ b/client/tests/kvm/kvm/installer.py @@ -266,6 +266,10 @@ class BaseInstaller(object): self.unload_modules() self.load_modules() + def reload_modules_if_needed(self): + if self.should_load_modules: + self.reload_modules() + class YumInstaller(BaseInstaller): """ Class that uses yum to install and remove packages. @@ -317,8 +321,7 @@ class YumInstaller(BaseInstaller): self._install_packages() create_symlinks(test_bindir=self.test_bindir, bin_list=self.qemu_bin_paths) - if self.should_load_modules: - self.reload_modules() + self.reload_modules_if_needed() if self.save_results: save_build(self.srcdir, self.results_dir) @@ -361,8 +364,7 @@ class KojiInstaller(YumInstaller): super(KojiInstaller, self)._install_packages() create_symlinks(test_bindir=self.test_bindir, bin_list=self.qemu_bin_paths) - if self.should_load_modules: - self.reload_modules() + self.reload_modules_if_needed() if self.save_results: save_build(self.srcdir, self.results_dir) @@ -471,8 +473,7 @@ class SourceDirInstaller(BaseInstaller): def install(self): self._build() self._install() - if self.should_load_modules: - self.reload_modules() + self.reload_modules_if_needed() if self.save_results: save_build(self.srcdir, self.results_dir) @@ -640,8 +641,7 @@ class GitInstaller(SourceDirInstaller): self._pull_code() self._build() self._install() - if self.should_load_modules: - self.reload_modules() + self.reload_modules_if_needed() if self.save_results: save_build(self.srcdir, self.results_dir) -- 1.7.3.2 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
