Skip to content

Commit

Permalink
Merge 2f7dd83 into eeb0deb
Browse files Browse the repository at this point in the history
  • Loading branch information
jonls committed Nov 1, 2018
2 parents eeb0deb + 2f7dd83 commit 846625c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions s3_deploy/tests/test_filematch.py
Expand Up @@ -83,24 +83,24 @@ def test_match_empty_on_empty(self):

def test_match_regex_dollar_suffix_ok(self):
self.assertTrue(filematch.match_key(
'image-\d+\.png$', 'image-999.png', regexp=True))
r'image-\d+\.png$', 'image-999.png', regexp=True))

def test_match_regex_dollar_suffix_fail(self):
self.assertFalse(filematch.match_key(
'image-\d+\.png$', 'image-name.png', regexp=True))
r'image-\d+\.png$', 'image-name.png', regexp=True))

def test_match_regex_caret_prefix_ok(self):
self.assertTrue(filematch.match_key(
'^dir\/index\.html', 'dir/index.html', regexp=True))
r'^dir\/index\.html', 'dir/index.html', regexp=True))

def test_match_regex_caret_prefix_fail(self):
self.assertFalse(filematch.match_key(
'^dir\/index\.html', 'altdir/index.html', regexp=True))
r'^dir\/index\.html', 'altdir/index.html', regexp=True))

def test_match_regex_caret_and_dollar_ok(self):
self.assertTrue(filematch.match_key(
'^dir\/index\.html$', 'dir/index.html', regexp=True))
r'^dir\/index\.html$', 'dir/index.html', regexp=True))

def test_match_regex_caret_and_dollar_fail(self):
self.assertFalse(filematch.match_key(
'^dir\/index\.html$', 'dir/index.htm', regexp=True))
r'^dir\/index\.html$', 'dir/index.htm', regexp=True))
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -9,7 +9,7 @@ envlist =
flake

[flake8]
ignore = E226,D101,D102,D103,D104,D203
ignore = E226,D101,D102,D103,D104,D203,W503,W504

[testenv]
deps = coverage
Expand Down

0 comments on commit 846625c

Please sign in to comment.