Commit graph

172 commits

Author SHA1 Message Date
Eric Engestrom
2f3035de0e Fix spelling mistakes 2016-04-02 15:50:09 +01:00
Joona Hoikkala
f8ba75805a Merge remote-tracking branch 'upstream/master' into 2478 2016-03-21 22:04:42 +02:00
Joona Hoikkala
bbbfe80b94 Changed testdata directory names and TwoVhost80Test to a better fitting one 2016-03-20 21:57:52 +02:00
Joona Hoikkala
9f1504eecd Trying to please Travis 2016-03-20 20:34:54 +02:00
Joona Hoikkala
092a1ee0fb Made apache configs a bit more generic for tests 2016-03-20 18:37:57 +02:00
Joona Hoikkala
d508a47e51 Added IPv6 address to Apache test data vhost 2016-03-20 18:08:53 +02:00
Joona Hoikkala
9ea8876898 Merge remote-tracking branch 'theboegl/master' into 2478 2016-03-20 11:30:56 +02:00
bmw
d674a74ba1 Merge pull request #2537 from letsencrypt/issue_2240
Apache: handle wildcards when matching server names (Issue #2240)
2016-02-26 16:54:47 -08:00
Brad Warren
13a4089ee6 I promise /tmp is a directory 2016-02-25 13:10:43 -08:00
Brad Warren
03ee5a01b7 Does someone not like quotes? 2016-02-25 12:49:35 -08:00
Brad Warren
73870ac9b6 tabs + spaces = headaches 2016-02-25 12:20:54 -08:00
Brad Warren
66e09fbf2f Fix path problems in section-continuations-2525.conf 2016-02-25 12:11:38 -08:00
Brad Warren
d9534cefb5 Revert "Revert "Merge Augeas lens fix for continuations in section headings""
This reverts commit b7a53541c5.
2016-02-23 17:38:33 -08:00
Noah Swartz
e46ce3028f coverage 2016-02-23 17:31:41 -08:00
bmw
b7a53541c5 Revert "Merge Augeas lens fix for continuations in section headings" 2016-02-23 16:51:11 -08:00
Peter Eckersley
f86ae1c461 Merge pull request #2530 from domcleal/2525-augeas-section-continuations
Merge Augeas lens fix for continuations in section headings
2016-02-23 15:56:12 -08:00
bmw
f5a2a94ed5 Merge pull request #2489 from letsencrypt/issue_2455
Fix apache 2.2 redirect problems (Issue 2455) [needs minor revision]
2016-02-23 11:40:47 -08:00
Dominic Cleal
40bca477a5 Merge Augeas lens fix for continuations in section headings
From 0b22176535

Closes: #2525
2016-02-23 09:37:35 +00:00
Dominic Cleal
6d1b0298ac Add failing test from ticket #2525
Augeas fails to parse the last new line/continuation between an IP in a
VirtualHost block and the closing `>` of the section.
2016-02-23 09:35:29 +00:00
bmw
22d6a9e8d9 Merge pull request #2105 from phispi/test_apache_modules
Added some standard apache2 modules that make tests fail.
2016-02-22 16:33:37 -08:00
Noah Swartz
c8a9da8442 update test to hit new line in configurator 2016-02-16 16:47:29 -08:00
Sebastian Bögl
b5bd330bd9 add vhost test cases containing IPv6 addresses
The two added vhost configuration files should test, whether a reversed
order, i.e. first an IPv6 entry followed by an IPv4 one, or an IPv6
adress without a given port works correctly.
2016-02-15 23:13:28 +01:00
Brad Warren
8ddebe3d12 Create tests to prevent future regressions 2016-02-01 18:21:02 -08:00
Roy Wellington Ⅳ
9c28364477 Make exception syntax Python 3 compatible.
Translate all except and raise statements that are in the old form to
the Python 3 compatible format.
2016-01-30 19:53:50 -08:00
bmw
33e0c8fe74 Merge pull request #2286 from SwartzCr/issue_1991
write servername/serveralias if copying a generic vhost
2016-01-29 17:29:10 -08:00
Noah Swartz
36e2c9a992 remove test hackery 2016-01-29 17:11:05 -08:00
Noah Swartz
7d63a0c8df fix stupid broken tests 2016-01-29 16:44:22 -08:00
Noah Swartz
fd9fa1b965 Merge pull request #2284 from SwartzCr/centos_sslcompression
make different options ssl conf for centos
2016-01-29 13:40:52 -08:00
Noah Swartz
ff98ae3f22 remove is_generic always write target_name 2016-01-28 13:25:10 -08:00
Brad Warren
870a743ce1 Detect * and _default_ conflict 2016-01-26 18:09:55 -08:00
Noah Swartz
4bae5b432c fix tests 2016-01-26 13:53:43 -08:00
Brad Warren
8ba59406ad When in doubt, use the config root 2016-01-26 11:40:44 -08:00
Noah Swartz
1a14b4c8d5 fix mapping issue 2016-01-26 10:39:54 -08:00
Peter Eckersley
bbb25c7d1b Merge remote-tracking branch 'origin/master' into non-interactive
(Merge conflict due to PEP8iness)
2016-01-15 16:04:38 -08:00
Joona Hoikkala
503787808a Merge remote-tracking branch 'upstream/master' into apache_pep8 2016-01-15 09:22:15 +02:00
Brad Warren
2939b62f24 Stop cover from failing 2016-01-14 16:59:29 -08:00
Brad Warren
b7b3f24da0 Convert sites-enabled files to symlinks 2016-01-14 16:35:20 -08:00
Joona Hoikkala
5357a556eb PyLint doesn't play well with six 2016-01-14 14:18:36 +02:00
Joona Hoikkala
be1d1321b6 Pep8 love 2016-01-14 13:25:15 +02:00
Joona Hoikkala
fe8a0dcef2 Make linter happy 2016-01-14 01:52:35 +02:00
Joona Hoikkala
8c110e31d7 Fixed tests 2016-01-14 01:30:34 +02:00
Joona Hoikkala
d0832f7414 Added the missing test 2016-01-14 01:09:28 +02:00
Joona Hoikkala
ddbfb44041 Add tests 2016-01-14 00:50:34 +02:00
Brad Warren
24e6f4142b Merge branch 'master' into apache-redirect 2016-01-11 18:21:51 -08:00
Brad Warren
10df56bab6 Added revisions 2016-01-11 18:21:33 -08:00
sagi
b28b5b08d7 More tests; Make Nose happy 2016-01-11 20:59:19 +00:00
sagi
9c2a0362a7 Add rewrite tests: normal, small, quoted, etc. 2016-01-11 19:55:55 +00:00
sagi
bf74b2cc64 Change test RewriteRule so that it conforms with Apaches spec. 2016-01-11 19:12:30 +00:00
Joona Hoikkala
39e4053b82 Removed some now obsolete mock code from tests 2016-01-10 19:15:09 +02:00
Peter Eckersley
e58fc0aaa6 Merge pull request #2110 from letsencrypt/precise-bootstrap
Precise bootstrap
2016-01-10 02:36:10 -08:00