1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2024-10-05 18:31:12 +01:00

tests: fix pytest warnings

Fix warnings reported when running unit tests via pytest.

- Rename TestDevice to MockDevice, so that it is not interpreted as a
  test case.
- Fix collections abstract base class imports.
- Add an ini file to ignore the same from "past".
This commit is contained in:
Sergei Trofimov 2019-12-03 12:44:25 +00:00 committed by Marc Bonnici
parent da0ceab027
commit cc1cc6f77f
5 changed files with 27 additions and 22 deletions

3
pytest.ini Normal file
View File

@ -0,0 +1,3 @@
[pytest]
filterwarnings=
ignore::DeprecationWarning:past[.*]

View File

@ -17,7 +17,7 @@
from wa import Plugin from wa import Plugin
class TestDevice(Plugin): class MockDevice(Plugin):
name = 'test-device' name = 'test-device'
kind = 'device' kind = 'device'

View File

@ -23,7 +23,7 @@ from wa.utils.exec_control import (init_environment, reset_environment,
activate_environment, once, activate_environment, once,
once_per_class, once_per_instance) once_per_class, once_per_instance)
class TestClass(object): class MockClass(object):
called = 0 called = 0
@ -32,7 +32,7 @@ class TestClass(object):
@once @once
def called_once(self): def called_once(self):
TestClass.called += 1 MockClass.called += 1
@once @once
def initilize_once(self): def initilize_once(self):
@ -50,7 +50,7 @@ class TestClass(object):
return '{}: Called={}'.format(self.__class__.__name__, self.called) return '{}: Called={}'.format(self.__class__.__name__, self.called)
class SubClass(TestClass): class SubClass(MockClass):
def __init__(self): def __init__(self):
super(SubClass, self).__init__() super(SubClass, self).__init__()
@ -110,7 +110,7 @@ class AnotherClass(object):
self.count += 1 self.count += 1
class AnotherSubClass(TestClass): class AnotherSubClass(MockClass):
def __init__(self): def __init__(self):
super(AnotherSubClass, self).__init__() super(AnotherSubClass, self).__init__()
@ -142,7 +142,7 @@ class EnvironmentManagementTest(TestCase):
def test_reset_current_environment(self): def test_reset_current_environment(self):
activate_environment('CURRENT_ENVIRONMENT') activate_environment('CURRENT_ENVIRONMENT')
t1 = TestClass() t1 = MockClass()
t1.initilize_once() t1.initilize_once()
assert_equal(t1.count, 1) assert_equal(t1.count, 1)
@ -152,7 +152,7 @@ class EnvironmentManagementTest(TestCase):
def test_switch_environment(self): def test_switch_environment(self):
activate_environment('ENVIRONMENT1') activate_environment('ENVIRONMENT1')
t1 = TestClass() t1 = MockClass()
t1.initilize_once() t1.initilize_once()
assert_equal(t1.count, 1) assert_equal(t1.count, 1)
@ -166,7 +166,7 @@ class EnvironmentManagementTest(TestCase):
def test_reset_environment_name(self): def test_reset_environment_name(self):
activate_environment('ENVIRONMENT') activate_environment('ENVIRONMENT')
t1 = TestClass() t1 = MockClass()
t1.initilize_once() t1.initilize_once()
assert_equal(t1.count, 1) assert_equal(t1.count, 1)
@ -195,7 +195,7 @@ class OnlyOnceEnvironmentTest(TestCase):
reset_environment('TEST_ENVIRONMENT') reset_environment('TEST_ENVIRONMENT')
def test_single_instance(self): def test_single_instance(self):
t1 = TestClass() t1 = MockClass()
ac = AnotherClass() ac = AnotherClass()
t1.initilize_once() t1.initilize_once()
@ -209,8 +209,8 @@ class OnlyOnceEnvironmentTest(TestCase):
def test_mulitple_instances(self): def test_mulitple_instances(self):
t1 = TestClass() t1 = MockClass()
t2 = TestClass() t2 = MockClass()
t1.initilize_once() t1.initilize_once()
assert_equal(t1.count, 1) assert_equal(t1.count, 1)
@ -220,7 +220,7 @@ class OnlyOnceEnvironmentTest(TestCase):
def test_sub_classes(self): def test_sub_classes(self):
t1 = TestClass() t1 = MockClass()
sc = SubClass() sc = SubClass()
ss = SubSubClass() ss = SubSubClass()
asc = AnotherSubClass() asc = AnotherSubClass()
@ -250,7 +250,7 @@ class OncePerClassEnvironmentTest(TestCase):
reset_environment('TEST_ENVIRONMENT') reset_environment('TEST_ENVIRONMENT')
def test_single_instance(self): def test_single_instance(self):
t1 = TestClass() t1 = MockClass()
ac = AnotherClass() ac = AnotherClass()
t1.initilize_once_per_class() t1.initilize_once_per_class()
@ -264,8 +264,8 @@ class OncePerClassEnvironmentTest(TestCase):
def test_mulitple_instances(self): def test_mulitple_instances(self):
t1 = TestClass() t1 = MockClass()
t2 = TestClass() t2 = MockClass()
t1.initilize_once_per_class() t1.initilize_once_per_class()
assert_equal(t1.count, 1) assert_equal(t1.count, 1)
@ -275,7 +275,7 @@ class OncePerClassEnvironmentTest(TestCase):
def test_sub_classes(self): def test_sub_classes(self):
t1 = TestClass() t1 = MockClass()
sc1 = SubClass() sc1 = SubClass()
sc2 = SubClass() sc2 = SubClass()
ss1 = SubSubClass() ss1 = SubSubClass()
@ -308,7 +308,7 @@ class OncePerInstanceEnvironmentTest(TestCase):
reset_environment('TEST_ENVIRONMENT') reset_environment('TEST_ENVIRONMENT')
def test_single_instance(self): def test_single_instance(self):
t1 = TestClass() t1 = MockClass()
ac = AnotherClass() ac = AnotherClass()
t1.initilize_once_per_instance() t1.initilize_once_per_instance()
@ -322,8 +322,8 @@ class OncePerInstanceEnvironmentTest(TestCase):
def test_mulitple_instances(self): def test_mulitple_instances(self):
t1 = TestClass() t1 = MockClass()
t2 = TestClass() t2 = MockClass()
t1.initilize_once_per_instance() t1.initilize_once_per_instance()
assert_equal(t1.count, 1) assert_equal(t1.count, 1)
@ -333,7 +333,7 @@ class OncePerInstanceEnvironmentTest(TestCase):
def test_sub_classes(self): def test_sub_classes(self):
t1 = TestClass() t1 = MockClass()
sc = SubClass() sc = SubClass()
ss = SubSubClass() ss = SubSubClass()
asc = AnotherSubClass() asc = AnotherSubClass()

View File

@ -59,7 +59,8 @@ to specify it explicitly.
import os import os
import re import re
import json as _json import json as _json
from collections import OrderedDict, Hashable from collections import OrderedDict
from collections.abc import Hashable
from datetime import datetime from datetime import datetime
import dateutil.parser import dateutil.parser
import yaml as _yaml # pylint: disable=wrong-import-order import yaml as _yaml # pylint: disable=wrong-import-order

View File

@ -38,7 +38,8 @@ if sys.version_info[0] == 3:
else: else:
from urllib import quote, unquote # pylint: disable=no-name-in-module from urllib import quote, unquote # pylint: disable=no-name-in-module
# pylint: disable=wrong-import-position # pylint: disable=wrong-import-position
from collections import defaultdict, MutableMapping from collections import defaultdict
from collections.abc import MutableMapping
from functools import total_ordering from functools import total_ordering
from future.utils import with_metaclass from future.utils import with_metaclass