From 09343077c86334ab68dc9b43858489ae7c735d74 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 17 Dec 2014 09:09:10 -0600 Subject: [PATCH] Fixed a couple imports that were importing teuthology.misc as teuthology. Signed-off-by: Andrew Schoen --- teuthology/test/test_get_distro.py | 16 +++++++++------- teuthology/test/test_get_distro_version.py | 19 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/teuthology/test/test_get_distro.py b/teuthology/test/test_get_distro.py index c61de99465..4524f6f298 100644 --- a/teuthology/test/test_get_distro.py +++ b/teuthology/test/test_get_distro.py @@ -1,6 +1,8 @@ -from .. import misc as teuthology +from ..misc import get_distro -class Mock: pass + +class Mock: + pass class TestGetDistro(object): @@ -12,25 +14,25 @@ class TestGetDistro(object): self.fake_ctx.os_type = None def test_default_distro(self): - distro = teuthology.get_distro(self.fake_ctx) + distro = get_distro(self.fake_ctx) assert distro == 'ubuntu' def test_argument(self): self.fake_ctx.os_type = 'centos' - distro = teuthology.get_distro(self.fake_ctx) + distro = get_distro(self.fake_ctx) assert distro == 'centos' def test_teuth_config(self): self.fake_ctx.config = {'os_type': 'fedora'} - distro = teuthology.get_distro(self.fake_ctx) + distro = get_distro(self.fake_ctx) assert distro == 'fedora' def test_teuth_config_downburst(self): self.fake_ctx.config = {'downburst' : {'distro': 'sles'}} - distro = teuthology.get_distro(self.fake_ctx) + distro = get_distro(self.fake_ctx) assert distro == 'sles' def test_no_config_or_os_type(self): self.fake_ctx = Mock() - distro = teuthology.get_distro(self.fake_ctx) + distro = get_distro(self.fake_ctx) assert distro == 'ubuntu' diff --git a/teuthology/test/test_get_distro_version.py b/teuthology/test/test_get_distro_version.py index e93b9b62a6..f597040098 100644 --- a/teuthology/test/test_get_distro_version.py +++ b/teuthology/test/test_get_distro_version.py @@ -1,6 +1,9 @@ -from .. import misc as teuthology +from ..misc import get_distro_version + + +class Mock: + pass -class Mock: pass class TestGetDistroVersion(object): @@ -14,34 +17,34 @@ class TestGetDistroVersion(object): def test_default_distro_version(self): #Default distro is ubuntu, default version of ubuntu is 12.04 self.fake_ctx.os_version = None - distroversion = teuthology.get_distro_version(self.fake_ctx) + distroversion = get_distro_version(self.fake_ctx) assert distroversion == '12.04' def test_argument_version(self): self.fake_ctx.os_version = '13.04' - distroversion = teuthology.get_distro_version(self.fake_ctx) + distroversion = get_distro_version(self.fake_ctx) assert distroversion == '13.04' def test_teuth_config_version(self): #Argument takes precidence. self.fake_ctx.os_version = '13.04' self.fake_ctx.config = {'os_version': '13.10'} - distroversion = teuthology.get_distro_version(self.fake_ctx) + distroversion = get_distro_version(self.fake_ctx) assert distroversion == '13.04' def test_teuth_config_downburst_version(self): #Argument takes precidence self.fake_ctx.os_version = '13.10' self.fake_ctx.config = {'downburst' : {'distroversion': '13.04'}} - distroversion = teuthology.get_distro_version(self.fake_ctx) + distroversion = get_distro_version(self.fake_ctx) assert distroversion == '13.10' def test_teuth_config_noarg_version(self): self.fake_ctx_noarg.config = {'os_version': '13.04'} - distroversion = teuthology.get_distro_version(self.fake_ctx_noarg) + distroversion = get_distro_version(self.fake_ctx_noarg) assert distroversion == '13.04' def test_teuth_config_downburst_noarg_version(self): self.fake_ctx_noarg.config = {'downburst' : {'distroversion': '13.04'}} - distroversion = teuthology.get_distro_version(self.fake_ctx_noarg) + distroversion = get_distro_version(self.fake_ctx_noarg) assert distroversion == '13.04' -- 2.39.5