From 1af84408a5edb7da7354322ad35061ef319d4128 Mon Sep 17 00:00:00 2001 From: jichenjc Date: Thu, 15 Oct 2015 03:56:58 +0800 Subject: [PATCH] sync test-requirement.txt to nova make some changes according to the update sync test-requirement.txt to nova's test-requirement.txt Change-Id: Ifa35af8ee7fd63cfdbc27f947de9b5d8bf40abc3 --- nova/tests/unit/virt/zvm/test_zvm.py | 4 ++-- nova/virt/zvm/dist.py | 2 +- nova/virt/zvm/utils.py | 2 +- test-requirements.txt | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nova/tests/unit/virt/zvm/test_zvm.py b/nova/tests/unit/virt/zvm/test_zvm.py index 5c224cd..a1977e2 100644 --- a/nova/tests/unit/virt/zvm/test_zvm.py +++ b/nova/tests/unit/virt/zvm/test_zvm.py @@ -1047,7 +1047,7 @@ class ZVMDriverTestCases(ZVMTestCase): 'fakeimagename', '/tmp').AndReturn('/tmp/fakeimg') self.mox.ReplayAll() - class FakeInstanceType: + class FakeInstanceType(object): def __init__(self): self.root_gb = 10 self.ephemeral_gb = 10 @@ -1092,7 +1092,7 @@ class ZVMDriverTestCases(ZVMTestCase): inst = fake_instance.fake_instance_obj(self.context) - class FakeInstanceType: + class FakeInstanceType(object): def __init__(self): self.root_gb = -1 self.ephemeral_gb = 10 diff --git a/nova/virt/zvm/dist.py b/nova/virt/zvm/dist.py index e304a32..4910916 100644 --- a/nova/virt/zvm/dist.py +++ b/nova/virt/zvm/dist.py @@ -333,7 +333,7 @@ class sles12(sles): return "echo 'root:%s' | chpasswd" % admin_password -class ListDistManager(): +class ListDistManager(object): def get_linux_dist(self, os_version): distro, release = self._parse_dist(os_version) return globals()[distro + release] diff --git a/nova/virt/zvm/utils.py b/nova/virt/zvm/utils.py index 572f4f8..7601f52 100644 --- a/nova/virt/zvm/utils.py +++ b/nova/virt/zvm/utils.py @@ -186,7 +186,7 @@ class XCATUrl(object): return rurl -class XCATConnection(): +class XCATConnection(object): """Https requests to xCAT web service.""" def __init__(self): diff --git a/test-requirements.txt b/test-requirements.txt index 62877e2..611b9ac 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,13 +1,13 @@ -hacking>=0.9.2,<0.10 +hacking<0.11,>=0.10.0 coverage>=3.6 discover -fixtures>=0.3.14 -python-subunit +fixtures>=1.3.1 +python-subunit>=0.0.18 sphinx>=1.1.2 oslosphinx -oslotest>=1.2.0 -testrepository>=0.0.17 +oslotest>=1.10.0 +testrepository>=0.0.18 testscenarios>=0.4,<0.5 -testtools>=0.9.32 -mock>=1.0 +testtools>=1.4.0 +mock>=1.2 mox>=0.5.3