f6dc176f0e
Based on Jim's feedback, change the branch matching logic to always have priority over ref matching. And v3 will always have refs, so no need to check if that attribute exists. Also adds a test that checks the current breakage of branch matching logic. Change-Id: Iba148b73a77b3300ad84db1c05c083d2c82cd950
156 lines
5.0 KiB
Python
156 lines
5.0 KiB
Python
# Copyright 2015 Red Hat, Inc.
|
|
#
|
|
# 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
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from zuul import change_matcher as cm
|
|
from zuul import model
|
|
|
|
from tests.base import BaseTestCase
|
|
|
|
|
|
class BaseTestMatcher(BaseTestCase):
|
|
|
|
project = 'project'
|
|
|
|
def setUp(self):
|
|
super(BaseTestMatcher, self).setUp()
|
|
self.change = model.Change(self.project)
|
|
|
|
|
|
class TestAbstractChangeMatcher(BaseTestMatcher):
|
|
|
|
def test_str(self):
|
|
matcher = cm.ProjectMatcher(self.project)
|
|
self.assertEqual(str(matcher), '{ProjectMatcher:project}')
|
|
|
|
def test_repr(self):
|
|
matcher = cm.ProjectMatcher(self.project)
|
|
self.assertEqual(repr(matcher), '<ProjectMatcher project>')
|
|
|
|
|
|
class TestProjectMatcher(BaseTestMatcher):
|
|
|
|
def test_matches_returns_true(self):
|
|
matcher = cm.ProjectMatcher(self.project)
|
|
self.assertTrue(matcher.matches(self.change))
|
|
|
|
def test_matches_returns_false(self):
|
|
matcher = cm.ProjectMatcher('not_project')
|
|
self.assertFalse(matcher.matches(self.change))
|
|
|
|
|
|
class TestBranchMatcher(BaseTestMatcher):
|
|
|
|
def setUp(self):
|
|
super(TestBranchMatcher, self).setUp()
|
|
self.matcher = cm.BranchMatcher('foo')
|
|
|
|
def test_matches_returns_true_on_matching_branch(self):
|
|
self.change.branch = 'foo'
|
|
self.assertTrue(self.matcher.matches(self.change))
|
|
|
|
def test_matches_returns_true_on_matching_ref(self):
|
|
delattr(self.change, 'branch')
|
|
self.change.ref = 'foo'
|
|
self.assertTrue(self.matcher.matches(self.change))
|
|
|
|
def test_matches_returns_false_for_no_match(self):
|
|
self.change.branch = 'bar'
|
|
self.change.ref = 'baz'
|
|
self.assertFalse(self.matcher.matches(self.change))
|
|
|
|
|
|
class TestFileMatcher(BaseTestMatcher):
|
|
|
|
def setUp(self):
|
|
super(TestFileMatcher, self).setUp()
|
|
self.matcher = cm.FileMatcher('filename')
|
|
|
|
def test_matches_returns_true(self):
|
|
self.change.files = ['filename']
|
|
self.assertTrue(self.matcher.matches(self.change))
|
|
|
|
def test_matches_returns_false_when_no_files(self):
|
|
self.assertFalse(self.matcher.matches(self.change))
|
|
|
|
def test_matches_returns_false_when_files_attr_missing(self):
|
|
delattr(self.change, 'files')
|
|
self.assertFalse(self.matcher.matches(self.change))
|
|
|
|
|
|
class TestAbstractMatcherCollection(BaseTestMatcher):
|
|
|
|
def test_str(self):
|
|
matcher = cm.MatchAll([cm.FileMatcher('foo')])
|
|
self.assertEqual(str(matcher), '{MatchAll:{FileMatcher:foo}}')
|
|
|
|
def test_repr(self):
|
|
matcher = cm.MatchAll([])
|
|
self.assertEqual(repr(matcher), '<MatchAll>')
|
|
|
|
|
|
class TestMatchAllFiles(BaseTestMatcher):
|
|
|
|
def setUp(self):
|
|
super(TestMatchAllFiles, self).setUp()
|
|
self.matcher = cm.MatchAllFiles([cm.FileMatcher('^docs/.*$')])
|
|
|
|
def _test_matches(self, expected, files=None):
|
|
if files is not None:
|
|
self.change.files = files
|
|
self.assertEqual(expected, self.matcher.matches(self.change))
|
|
|
|
def test_matches_returns_false_when_files_attr_missing(self):
|
|
delattr(self.change, 'files')
|
|
self._test_matches(False)
|
|
|
|
def test_matches_returns_false_when_no_files(self):
|
|
self._test_matches(False)
|
|
|
|
def test_matches_returns_false_when_not_all_files_match(self):
|
|
self._test_matches(False, files=['/COMMIT_MSG', 'docs/foo', 'foo/bar'])
|
|
|
|
def test_matches_returns_true_when_single_file_does_not_match(self):
|
|
self._test_matches(True, files=['docs/foo'])
|
|
|
|
def test_matches_returns_false_when_commit_message_matches(self):
|
|
self._test_matches(False, files=['/COMMIT_MSG'])
|
|
|
|
def test_matches_returns_true_when_all_files_match(self):
|
|
self._test_matches(True, files=['/COMMIT_MSG', 'docs/foo'])
|
|
|
|
def test_matches_returns_true_when_single_file_matches(self):
|
|
self._test_matches(True, files=['docs/foo'])
|
|
|
|
|
|
class TestMatchAll(BaseTestMatcher):
|
|
|
|
def test_matches_returns_true(self):
|
|
matcher = cm.MatchAll([cm.ProjectMatcher(self.project)])
|
|
self.assertTrue(matcher.matches(self.change))
|
|
|
|
def test_matches_returns_false_for_missing_matcher(self):
|
|
matcher = cm.MatchAll([cm.ProjectMatcher('not_project')])
|
|
self.assertFalse(matcher.matches(self.change))
|
|
|
|
|
|
class TestMatchAny(BaseTestMatcher):
|
|
|
|
def test_matches_returns_true(self):
|
|
matcher = cm.MatchAny([cm.ProjectMatcher(self.project)])
|
|
self.assertTrue(matcher.matches(self.change))
|
|
|
|
def test_matches_returns_false(self):
|
|
matcher = cm.MatchAny([cm.ProjectMatcher('not_project')])
|
|
self.assertFalse(matcher.matches(self.change))
|