Skip to content

Commit 9824b09

Browse files
Cherry picked removed hard coded content from staging-v1.9.0-beta.1 (#1194)
* Cherry picked removed hard coded content from staging-v1.9.0-beta.1 Added preferred volumes changes [v1.10.0] [zos_copy] Enhance zos_copy performance when copying multiple PDS members (#1183) * [v1.9.0] [zos_copy] Enhancement/764/copy members (#1176) * Changed member copy into a bulk call * Modified copy to members * Cleaned code * Removed hardcoded content from zos_copy tests * Added fix for uss files * Added distinction between uss and mvs * Added alias fix * Moved the copy section to below * Modified for seq test * Added fix for copy dest lock * Added msgs for debugging * Added final changes to member copy * Added copy for when seq to pdse * Add changelog * Added a line into docs * Modified doc * Modified doc * Update changelog * Created a new changelog * Corrected typo Fix for empty volumes on test_config Added comment to remind uncomment test case in the future Add more validation Add more validation Add more validation Add to config volumes and remove upper case variable name * Added keyword into tests --------- Co-authored-by: André Marcel Gutiérrez Benítez <68956970+AndreMarcel99@users.noreply.github.com>
1 parent 3b3176b commit 9824b09

19 files changed

+1649
-1088
lines changed

tests/conftest.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
from __future__ import absolute_import, division, print_function
1313

1414
__metaclass__ = type
15-
1615
import pytest
1716
from ibm_zos_core.tests.helpers.ztest import ZTestHelper
17+
from ibm_zos_core.tests.helpers.volumes import get_volumes
1818
import sys
1919
from mock import MagicMock
2020
import importlib
@@ -84,6 +84,14 @@ def ansible_zos_module(request, z_python_interpreter):
8484
except Exception:
8585
pass
8686

87+
# Call of the class by the class ls_Volume (volumes.py file) as many times needed
88+
# one time the array is filled
89+
@pytest.fixture(scope="session")
90+
def volumes_on_systems(ansible_zos_module, request):
91+
""" Call the pytest-ansible plugin to check volumes on the system and work properly a list by session."""
92+
path = request.config.getoption("--zinventory")
93+
list_Volumes = get_volumes(ansible_zos_module, path)
94+
yield list_Volumes
8795

8896
# * We no longer edit sys.modules directly to add zoautil_py mock
8997
# * because automatic teardown is not performed, leading to mock pollution
@@ -108,4 +116,4 @@ def perform_imports(imports):
108116
newimp = [importlib.import_module(x) for x in imports]
109117
return newimp
110118

111-
yield (mocker, perform_imports)
119+
yield (mocker, perform_imports)

0 commit comments

Comments
 (0)