Updated test_zos_apf

Author: fernandofloresg

tests/functional/modules/test_zos_apf_func.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-<<<<<<< HEAD
 # Copyright (c) IBM Corporation 2020, 2025
-=======
-# Copyright (c) IBM Corporation 2020, 2024
->>>>>>> e7ffe6d0217a0dba440e7f34fbe27b524a07751c
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,15 +12,9 @@
 # limitations under the License.
 
 from __future__ import absolute_import, division, print_function
-<<<<<<< HEAD
 from ibm_zos_core.tests.helpers.dataset import get_tmp_ds_name
 from ibm_zos_core.tests.helpers.volumes import Volume_Handler
 from ibm_zos_core.tests.helpers.version import get_zoau_version
-=======
-import pytest
-from ibm_zos_core.tests.helpers.dataset import get_tmp_ds_name
-from ibm_zos_core.tests.helpers.volumes import Volume_Handler
->>>>>>> e7ffe6d0217a0dba440e7f34fbe27b524a07751c
 
 __metaclass__ = type
 
@@ -415,10 +405,6 @@ def test_operation_list_with_filter(ansible_zos_module, volumes_with_vvds):
 # Negative tests
 #
 
-<<<<<<< HEAD
-=======
-
->>>>>>> e7ffe6d0217a0dba440e7f34fbe27b524a07751c
 def test_add_already_present(ansible_zos_module, volumes_with_vvds):
     try:
         hosts = ansible_zos_module
@@ -451,7 +437,6 @@ def test_add_already_present(ansible_zos_module, volumes_with_vvds):
         results = hosts.all.zos_apf(**test_info)
         for result in results.contacted.values():
             assert result.get("rc") == 0
-<<<<<<< HEAD
         # Second call to zos_apf, same as first but with different expectations
         results = hosts.all.zos_apf(**test_info)
         for result in results.contacted.values():
@@ -466,12 +451,6 @@ def test_add_already_present(ansible_zos_module, volumes_with_vvds):
                 assert rc == 8
             else:
                 assert rc == 16 
-=======
-        results = hosts.all.zos_apf(**test_info)
-        for result in results.contacted.values():
-            # Return code 16 if ZOAU < 1.2.0 and RC is 8 if ZOAU >= 1.2.0
-            assert result.get("rc") == 16 or result.get("rc") == 8
->>>>>>> e7ffe6d0217a0dba440e7f34fbe27b524a07751c
         test_info['state'] = 'absent'
         hosts.all.zos_apf(**test_info)
     finally:
@@ -509,7 +488,6 @@ def test_del_not_present(ansible_zos_module, volumes_with_vvds):
         test_info['state'] = 'absent'
         results = hosts.all.zos_apf(**test_info)
         for result in results.contacted.values():
-<<<<<<< HEAD
             # RC 0 should be allowed for ZOAU >= 1.3.4,
             # in zoau < 1.3.4 -i is not recognized  in apfadm
             # Return code 16 if ZOAU < 1.2.0 and RC is 8 if ZOAU >= 1.2.0
@@ -521,10 +499,6 @@ def test_del_not_present(ansible_zos_module, volumes_with_vvds):
                 assert rc == 8
             else:
                 assert rc == 16
-=======
-            # Return code 16 if ZOAU < 1.2.0 and RC is 8 if ZOAU >= 1.2.0
-            assert result.get("rc") == 16 or result.get("rc") == 8
->>>>>>> e7ffe6d0217a0dba440e7f34fbe27b524a07751c
     finally:
         clean_test_env(hosts, test_info)