Browse Source

Merge "Don't test candidate files if they're removed"

changes/77/771077/3
Zuul 4 months ago
committed by Gerrit Code Review
parent
commit
bd41d79fb0
2 changed files with 5 additions and 2 deletions
  1. +2
    -1
      openstack_election/cmds/ci_check_all_candidate_files.py
  2. +3
    -1
      openstack_election/tests/cmds/test_ci_checks.py

+ 2
- 1
openstack_election/cmds/ci_check_all_candidate_files.py View File

@ -76,7 +76,7 @@ def check_for_changes(projects, filepath, limit, verbose=0):
def find_modified_candidate_files():
"Return a list of files modified by the most recent commit."
"Return a list of non-removed files modified by the most recent commit."
results = subprocess.check_output(
['git', 'diff', '--name-only', '--pretty=format:', 'HEAD^']
).decode('utf-8')
@ -84,6 +84,7 @@ def find_modified_candidate_files():
li.strip()
for li in results.splitlines()
if (li.startswith(utils.CANDIDATE_PATH + '/') and
os.path.exists(li) and
not li.endswith('.placeholder'))
]
return filenames


+ 3
- 1
openstack_election/tests/cmds/test_ci_checks.py View File

@ -37,8 +37,10 @@ class TestFindModifiedCandidateFiles(base.ElectionTestCase):
ci_check_all_candidate_files.find_modified_candidate_files()
self.assertEqual(expected_filenames, filenames)
@mock.patch('os.path.exists', return_value=True)
@mock.patch('subprocess.check_output')
def test_find_modified_candidate_files_all_good(self, mock_check_output):
def test_find_modified_candidate_files_all_good(
self, mock_check_output, mock_path_exists):
check_output = (('configuration.yaml\n'
'openstack_election/__init__py\n'
'%(path)s/candidate\n'


Loading…
Cancel
Save