remove the need for teuthology.misc in teuthology.packaging

It's best to get the package type from remote.os.package_type. This also
fixes a circular import that will allows me to import
teuthology.packaging into teuthology.misc

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 2a7d1c0fe15429bf959cdd5c52a18fe45720123c..38a7899c0b4d2d3fcc501e6fb3cecb2e4ce6824d 100644 (file)
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -5,7 +5,6 @@ import requests
 
 from cStringIO import StringIO
 
-from teuthology import misc
 from .config import config
 
 log = logging.getLogger(__name__)
@@ -53,7 +52,7 @@ def get_package_name(pkg, rem):
     """
     Find the remote-specific name of the generic 'pkg'
     """
-    flavor = misc.get_system_type(rem)
+    flavor = rem.os.package_type
 
     try:
         return _PACKAGE_MAP[pkg][flavor]
@@ -65,7 +64,7 @@ def get_service_name(service, rem):
     """
     Find the remote-specific name of the generic 'service'
     """
-    flavor = misc.get_system_type(rem)
+    flavor = rem.os.package_type
     try:
         return _SERVICE_MAP[service][flavor]
     except KeyError:
@@ -78,7 +77,7 @@ def install_package(package, remote):
     Assumes repo has already been set up (perhaps with install_repo)
     """
     log.info('Installing package %s on %s', package, remote)
-    flavor = misc.get_system_type(remote)
+    flavor = remote.os.package_type
     if flavor == 'deb':
         pkgcmd = ['DEBIAN_FRONTEND=noninteractive',
                   'sudo',
@@ -103,7 +102,7 @@ def remove_package(package, remote):
     """
     Remove package from remote
     """
-    flavor = misc.get_system_type(remote)
+    flavor = remote.os.package_type
     if flavor == 'deb':
         pkgcmd = ['DEBIAN_FRONTEND=noninteractive',
                   'sudo',

diff --git a/teuthology/test/test_packaging.py b/teuthology/test/test_packaging.py
index a7b06d78d6ab7ade13975141f2cdf7db4d14031f..65f95987bd6ad6c2ac08616a01cfadda76ca1785 100644 (file)
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -28,40 +28,39 @@ KOJI_TASK_RPMS = [rpm[0] for rpm in KOJI_TASK_RPMS_MATRIX]
 
 class TestPackaging(object):
 
-    @patch("teuthology.packaging.misc")
-    def test_get_package_name_deb(self, m_misc):
-        m_misc.get_system_type.return_value = "deb"
-        assert packaging.get_package_name('sqlite', Mock()) == "sqlite3"
-
-    @patch("teuthology.packaging.misc")
-    def test_get_package_name_rpm(self, m_misc):
-        m_misc.get_system_type.return_value = "rpm"
-        assert packaging.get_package_name('sqlite', Mock()) is None
-
-    @patch("teuthology.packaging.misc")
-    def test_get_package_name_not_found(self, m_misc):
-        m_misc.get_system_type.return_value = "rpm"
-        assert packaging.get_package_name('notthere', Mock()) is None
-
-    @patch("teuthology.packaging.misc")
-    def test_get_service_name_deb(self, m_misc):
-        m_misc.get_system_type.return_value = "deb"
-        assert packaging.get_service_name('httpd', Mock()) == 'apache2'
-
-    @patch("teuthology.packaging.misc")
-    def test_get_service_name_rpm(self, m_misc):
-        m_misc.get_system_type.return_value = "rpm"
-        assert packaging.get_service_name('httpd', Mock()) == 'httpd'
-
-    @patch("teuthology.packaging.misc")
-    def test_get_service_name_not_found(self, m_misc):
-        m_misc.get_system_type.return_value = "rpm"
-        assert packaging.get_service_name('notthere', Mock()) is None
-
-    @patch("teuthology.packaging.misc")
-    def test_install_package_deb(self, m_misc):
-        m_misc.get_system_type.return_value = "deb"
+    def test_get_package_name_deb(self):
+        remote = Mock()
+        remote.os.package_type = "deb"
+        assert packaging.get_package_name('sqlite', remote) == "sqlite3"
+
+    def test_get_package_name_rpm(self):
+        remote = Mock()
+        remote.os.package_type = "rpm"
+        assert packaging.get_package_name('sqlite', remote) is None
+
+    def test_get_package_name_not_found(self):
+        remote = Mock()
+        remote.os.package_type = "rpm"
+        assert packaging.get_package_name('notthere', remote) is None
+
+    def test_get_service_name_deb(self):
+        remote = Mock()
+        remote.os.package_type = "deb"
+        assert packaging.get_service_name('httpd', remote) == 'apache2'
+
+    def test_get_service_name_rpm(self):
+        remote = Mock()
+        remote.os.package_type = "rpm"
+        assert packaging.get_service_name('httpd', remote) == 'httpd'
+
+    def test_get_service_name_not_found(self):
+        remote = Mock()
+        remote.os.package_type = "rpm"
+        assert packaging.get_service_name('notthere', remote) is None
+
+    def test_install_package_deb(self):
         m_remote = Mock()
+        m_remote.os.package_type = "deb"
         expected = [
             'DEBIAN_FRONTEND=noninteractive',
             'sudo',
@@ -74,10 +73,9 @@ class TestPackaging(object):
         packaging.install_package('apache2', m_remote)
         m_remote.run.assert_called_with(args=expected)
 
-    @patch("teuthology.packaging.misc")
-    def test_install_package_rpm(self, m_misc):
-        m_misc.get_system_type.return_value = "rpm"
+    def test_install_package_rpm(self):
         m_remote = Mock()
+        m_remote.os.package_type = "rpm"
         expected = [
             'sudo',
             'yum',
@@ -88,10 +86,9 @@ class TestPackaging(object):
         packaging.install_package('httpd', m_remote)
         m_remote.run.assert_called_with(args=expected)
 
-    @patch("teuthology.packaging.misc")
-    def test_remove_package_deb(self, m_misc):
-        m_misc.get_system_type.return_value = "deb"
+    def test_remove_package_deb(self):
         m_remote = Mock()
+        m_remote.os.package_type = "deb"
         expected = [
             'DEBIAN_FRONTEND=noninteractive',
             'sudo',
@@ -104,10 +101,9 @@ class TestPackaging(object):
         packaging.remove_package('apache2', m_remote)
         m_remote.run.assert_called_with(args=expected)
 
-    @patch("teuthology.packaging.misc")
-    def test_remove_package_rpm(self, m_misc):
-        m_misc.get_system_type.return_value = "rpm"
+    def test_remove_package_rpm(self):
         m_remote = Mock()
+        m_remote.os.package_type = "rpm"
         expected = [
             'sudo',
             'yum',