Function test: Improved conftest.py, completed User, added BaseResource #2072
+1,312
−482
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andy-maier
force-pushed
the
andy/ft-rework
branch
from
057bb96 to
f7572cc
Compare
Collaborator
andy-maier
force-pushed
the
andy/ft-rework
branch
2 times, most recently
from
00ae4e5 to
277fdc9
Compare
andy-maier
force-pushed
the
andy/ft-rework
branch
from
277fdc9 to
7674129
Compare
Details:
* Redesigned the JSON schema for the YAML test files:
- Added support for defining setup resources at the test file level
and at the testcase level by adding a new property 'setup'. That
required the list of testcases to be moved under a top-level
property 'testcases'. The setup objects are stored in a dictionary
and can be looked up by URI.
- Moved the definition of a HMC session from a top-level hmc_session
property in each testcase to become definable at the test file level
and at the testcase level, within the new 'setup' property.
- Defined a schema definition 'value' that represents a Python
value for method parameters, method return values, or property
values. That fixed the issue that previously, zhmcclient
resource and manager objects could only be represented as single
objects but not as items in a list or dict. Also, zhmcclient
resource and manager objects are now referenced via URI lookup
in the dictionary resulting from the setup resources.
- Changed the way the target object of the test is specified, to
also use the same approach as for 'value', except that it must be
either a resource or manager object.
- Changed the way method parameter values and method return values
are specified in the testcase YAML, to use the 'value' definition.
* Adjusted the test code in conftest.py to the new test file structure.
* In conftest.py, introduced a class TestcaseData in order to
isolate the data properties pytest does not care about from other
properties pytest does care about. Before that, it happened that
a test property happened to use the name of a property known by
pytest.
* In conftest.py, fixed the issue that requests_mock records only
the last HTTP request/response pair, by maintaning our own
list of requests. Apparently, that limitation in requests_mock
is intentional to keep it simple. The request_mock pytest fixture
solves that issue, but we cannot use that fixture because we do
not have pytest test functions.
* In conftest.py, fixed the issue that the zhmcclient result was
compared with == which lead to comparison failures for different
but equal objects, and for zhmcclient.BaseResource objects due to
their timestamp property, and for immutabledict objects returned
by some properties. This was fixed by adding an assert_result()
method that performs these comparisons more thoughtfully.
* Adjusted the existing test_user.yaml test file to the new schema,
and added testcases for the remaining methods and properties
of zhmcclient.User, except for inherited ones.
* Added a new test file test_resource.yaml and defined testcases
for any methods and properties inherited into resource classes.
Signed-off-by: Andreas Maier <[email protected]>
andy-maier
force-pushed
the
andy/ft-rework
branch
from
7674129 to
8c97d4f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For details, see the commit message.
TODOs: