From c4162507f92e7c0e315db2f6fcef65d6aefd54cf Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Fri, 30 Nov 2012 17:53:50 +0000 Subject: Mock and check architecture in the tests --- (limited to 'devbot/plugins') diff --git a/devbot/plugins/debian.py b/devbot/plugins/debian.py index eea0001..856a7f7 100644 --- a/devbot/plugins/debian.py +++ b/devbot/plugins/debian.py @@ -86,7 +86,7 @@ distro.register_package_manager("debian", PackageManager) class DistroInfo(interfaces.DistroInfo): _DEBIAN_VERSION_PATH = "/etc/debian_version" def __init__(self): - arch = subprocess.check_output(["arch"]).strip() + arch = self._get_architecture() self.name = "debian" self.version = "unknown" @@ -110,4 +110,7 @@ class DistroInfo(interfaces.DistroInfo): else: self.supported = False + def _get_architecture(self): + return subprocess.check_output(["arch"]).strip() + distro.register_distro_info(DistroInfo) diff --git a/devbot/plugins/fedora.py b/devbot/plugins/fedora.py index 27f1d17..862ca81 100644 --- a/devbot/plugins/fedora.py +++ b/devbot/plugins/fedora.py @@ -85,7 +85,7 @@ class DistroInfo(interfaces.DistroInfo): _FEDORA_RELEASE_PATH = "/etc/fedora-release" def __init__(self): - arch = subprocess.check_output(["uname", "-i"]).strip() + arch = self._get_architecture() self.name = "fedora" self.version = "unknown" @@ -110,4 +110,7 @@ class DistroInfo(interfaces.DistroInfo): else: self.supported = False + def _get_architecture(self): + return subprocess.check_output(["uname", "-i"]).strip() + distro.register_distro_info(DistroInfo) diff --git a/devbot/plugins/ubuntu.py b/devbot/plugins/ubuntu.py index 47379ac..140d8ad 100644 --- a/devbot/plugins/ubuntu.py +++ b/devbot/plugins/ubuntu.py @@ -9,7 +9,7 @@ distro.register_package_manager("ubuntu", debian.PackageManager) class DistroInfo(interfaces.DistroInfo): _OS_RELEASE_PATH="/etc/os-release" def __init__(self): - arch = subprocess.check_output(["uname", "-i"]).strip() + arch = self._get_architecture() self.name = "ubuntu" self.version = "unknown" @@ -40,4 +40,7 @@ class DistroInfo(interfaces.DistroInfo): if self.version and self.version >= "12.10": self.gnome_version = "3.6" + def _get_architecture(self): + return subprocess.check_output(["uname", "-i"]).strip() + distro.register_distro_info(DistroInfo) -- cgit v0.9.1