From 3478bfb50f2f284d0c60f4803557f57002f3f4e6 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Tue, 20 Apr 2010 01:16:18 +0200
Subject: [PATCH] Testsuite: avoid using existing e-mail addresses and domains
in tests.
---
tests/address.svtest | 12 +--
tests/comparators/core.svtest | 4 +-
tests/compile/errors/address-part.sieve | 2 +-
tests/compile/errors/envelope.sieve | 8 +-
tests/compile/errors/match-type.sieve | 2 +-
tests/compile/errors/out-address.sieve | 12 +--
tests/compile/errors/unsupported.sieve | 2 +-
.../compile/recover/commands-semicolon.sieve | 4 +-
tests/compile/redirect.sieve | 38 +++++-----
tests/compile/warnings/invalid-headers.sieve | 4 +-
tests/control-structures.svtest | 16 ++--
tests/deprecated/notify/basic.svtest | 2 +-
tests/deprecated/notify/denotify.svtest | 60 +++++++--------
tests/deprecated/notify/errors/options.sieve | 4 +-
.../notify/execute/duplicates.sieve | 4 +-
tests/deprecated/notify/mailto.svtest | 46 ++++++------
tests/execute/actions.svtest | 4 +-
tests/execute/actions/fileinto.sieve | 2 +-
tests/execute/actions/redirect.sieve | 4 +-
tests/execute/mailstore.svtest | 12 +--
tests/execute/smtp.svtest | 22 +++---
tests/exists.svtest | 4 +-
tests/extensions/body/basic.svtest | 8 +-
tests/extensions/body/match-values.svtest | 12 +--
tests/extensions/date/basic.svtest | 4 +-
tests/extensions/date/date-parts.svtest | 4 +-
tests/extensions/date/zones.svtest | 8 +-
tests/extensions/enotify/basic.svtest | 2 +-
.../enotify/errors/from-mailto.sieve | 2 +-
tests/extensions/enotify/errors/options.sieve | 10 +--
.../enotify/errors/uri-mailto.sieve | 12 +--
tests/extensions/enotify/errors/uri.sieve | 2 +-
.../enotify/execute/duplicates.sieve | 4 +-
tests/extensions/enotify/mailto.svtest | 74 +++++++++----------
.../enotify/notify_method_capability.svtest | 4 +-
.../enotify/valid_notify_method.svtest | 8 +-
tests/extensions/envelope.svtest | 52 ++++++-------
tests/extensions/include/execute.svtest | 2 +-
.../included/rfc-ex1-mailing_lists.sieve | 4 +-
tests/extensions/mailbox/execute.svtest | 8 +-
tests/extensions/regex/basic.svtest | 8 +-
tests/extensions/regex/errors/compile.sieve | 8 +-
tests/extensions/regex/match-values.svtest | 12 +--
tests/extensions/reject/execute.svtest | 4 +-
tests/extensions/reject/execute/basic.sieve | 2 +-
tests/extensions/reject/smtp.svtest | 12 +--
tests/extensions/relational/basic.svtest | 8 +-
.../extensions/spamvirustest/spamtest.svtest | 6 +-
.../spamvirustest/spamtestplus.svtest | 2 +-
.../extensions/spamvirustest/virustest.svtest | 2 +-
tests/extensions/subaddress/basic.svtest | 8 +-
tests/extensions/subaddress/config.svtest | 6 +-
tests/extensions/subaddress/rfc.svtest | 4 +-
.../extensions/vacation/execute/action.sieve | 2 +-
.../vacation/execute/no-handle.sieve | 2 +-
tests/extensions/vacation/message.svtest | 16 ++--
tests/extensions/vacation/smtp.svtest | 44 +++++------
tests/extensions/vacation/utf-8.svtest | 16 ++--
tests/extensions/variables/basic.svtest | 10 +--
tests/extensions/variables/match.svtest | 20 ++---
tests/header.svtest | 4 +-
tests/match-types/contains.svtest | 16 ++--
tests/match-types/is.svtest | 4 +-
tests/match-types/matches.svtest | 39 +++++-----
tests/multiscript/basic.svtest | 6 +-
tests/multiscript/conflicts.svtest | 6 +-
tests/multiscript/notify.sieve | 2 +-
tests/testsuite.svtest | 28 +++----
68 files changed, 392 insertions(+), 393 deletions(-)
diff --git a/tests/address.svtest b/tests/address.svtest
index 2b54bb06e..86f75aff4 100644
--- a/tests/address.svtest
+++ b/tests/address.svtest
@@ -7,7 +7,7 @@ require "vnd.dovecot.testsuite";
test_set "message" text:
From: stephan@
-To: @rename-it.nl
+To: @example.org
Cc: nonsense
Resent-To:
Subject: Invalid addresses
@@ -21,7 +21,7 @@ test "Invalid single addresses" {
test_fail ":localpart matched invalid address";
}
- if address :domain "to" "rename-it.nl" {
+ if address :domain "to" "example.org" {
test_fail ":domain matched invalid address";
}
@@ -40,8 +40,8 @@ test "Invalid single addresses" {
test_set "message" text:
From: stephan@
-To: nico@vestingbar.nl, @rename-it.nl
-Cc: stephan@rename-it.nl, nonsense
+To: nico@frop.example.com, @example.org
+Cc: stephan@example.org, nonsense
Subject: Invalid addresses
Test.
@@ -53,7 +53,7 @@ test "Invalid address list" {
test_fail ":localpart matched invalid address";
}
- if address :is :domain "to" "rename-it.nl" {
+ if address :is :domain "to" "example.org" {
test_fail ":domain matched invalid address";
}
}
@@ -87,7 +87,7 @@ test "Undisclosed recipients" {
test_set "message" text:
From: SPAM@MYDOMAIN
-To: stephan@renane-it.nl
+To: stephan@example.org
Subject: Spam
Spam!
diff --git a/tests/comparators/core.svtest b/tests/comparators/core.svtest
index 54ab34ef2..c504d629d 100644
--- a/tests/comparators/core.svtest
+++ b/tests/comparators/core.svtest
@@ -1,9 +1,9 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan@rename-it.nl
+From: stephan@example.org
Cc: frop@example.com
-To: test@dovecot.org
+To: test@dovecot.example.net
X-A: This is a TEST header
Subject: Test Message
diff --git a/tests/compile/errors/address-part.sieve b/tests/compile/errors/address-part.sieve
index 0abc07d64..1d10cbf3a 100644
--- a/tests/compile/errors/address-part.sieve
+++ b/tests/compile/errors/address-part.sieve
@@ -8,7 +8,7 @@
if address :all :comparator "i;octet" :domain "from" "STEPHAN" {
# Duplicate address part (2)
- if address :domain :localpart :comparator "i;octet" "from" "drunksnipers.com" {
+ if address :domain :localpart :comparator "i;octet" "from" "friep.example.com" {
keep;
}
diff --git a/tests/compile/errors/envelope.sieve b/tests/compile/errors/envelope.sieve
index 71d85b4b3..a19f0af83 100644
--- a/tests/compile/errors/envelope.sieve
+++ b/tests/compile/errors/envelope.sieve
@@ -7,17 +7,17 @@
require "envelope";
# Not an error
-if envelope :is "to" "frop@rename-it.nl" {
+if envelope :is "to" "frop@example.org" {
}
# Unknown envelope part (1)
-if envelope :is "frop" "frop@rename-it.nl" {
+if envelope :is "frop" "frop@example.org" {
}
# Not an error
-if envelope :is ["to","from"] "frop@rename-it.nl" {
+if envelope :is ["to","from"] "frop@example.org" {
}
# Unknown envelope part (2)
-if envelope :is ["to","frop"] "frop@rename-it.nl" {
+if envelope :is ["to","frop"] "frop@example.org" {
}
diff --git a/tests/compile/errors/match-type.sieve b/tests/compile/errors/match-type.sieve
index 4df456405..78bc3ce20 100644
--- a/tests/compile/errors/match-type.sieve
+++ b/tests/compile/errors/match-type.sieve
@@ -1,6 +1,6 @@
require "comparator-i;ascii-numeric";
-if header :contains :comparator "i;ascii-numeric" "from" "drunksnipers.com" {
+if header :contains :comparator "i;ascii-numeric" "from" "friep.example.com" {
keep;
}
diff --git a/tests/compile/errors/out-address.sieve b/tests/compile/errors/out-address.sieve
index 1b06446c0..ef96f400a 100644
--- a/tests/compile/errors/out-address.sieve
+++ b/tests/compile/errors/out-address.sieve
@@ -5,23 +5,23 @@ require "vacation";
redirect "@wrong.example.com";
redirect "error";
redirect "error@";
-redirect "Stephan Bosch error@rename-it.nl";
-redirect "Stephan Bosch <error@rename-it.nl";
+redirect "Stephan Bosch error@example.org";
+redirect "Stephan Bosch <error@example.org";
redirect " more error @ example.com ";
redirect "@";
redirect "<>";
redirect "Error <";
redirect "Error <stephan";
redirect "Error <stephan@";
-redirect "stephan@rename-it.nl,tss@iki.fi";
-redirect "stephan@rename-it.nl,%&^&!!~";
+redirect "stephan@example.org,tss@example.net";
+redirect "stephan@example.org,%&^&!!~";
vacation :from "Error" "Ik ben er niet.";
# Ok
-redirect "Ok Good <stephan@rename-it.nl>";
+redirect "Ok Good <stephan@example.org>";
redirect "ok@example.com";
redirect " more @ example.com ";
-vacation :from "good@voorbeeld.nl" "Ik ben weg!";
+vacation :from "good@voorbeeld.nl.example.com" "Ik ben weg!";
diff --git a/tests/compile/errors/unsupported.sieve b/tests/compile/errors/unsupported.sieve
index 6ecf21d07..a9481d256 100644
--- a/tests/compile/errors/unsupported.sieve
+++ b/tests/compile/errors/unsupported.sieve
@@ -16,7 +16,7 @@ require "regex";
set "comp" "i;ascii-numeric";
-if address :comparator "${comp}" "from" "stephan@rename-it.nl" {
+if address :comparator "${comp}" "from" "stephan@example.org" {
stop;
}
diff --git a/tests/compile/recover/commands-semicolon.sieve b/tests/compile/recover/commands-semicolon.sieve
index 225403cac..2571038af 100644
--- a/tests/compile/recover/commands-semicolon.sieve
+++ b/tests/compile/recover/commands-semicolon.sieve
@@ -1,7 +1,7 @@
keep;
discard;
keep
-redirect "frop@frop.nl";
+redirect "frop@nl.example.com";
discard;
keep
-redirect "frml@frop.nl";
+redirect "frml@nl.example.com";
diff --git a/tests/compile/redirect.sieve b/tests/compile/redirect.sieve
index 890855202..efef440c1 100644
--- a/tests/compile/redirect.sieve
+++ b/tests/compile/redirect.sieve
@@ -1,23 +1,23 @@
# Test various white space occurences
-redirect "stephan@rename-it.nl";
-redirect " stephan@rename-it.nl";
-redirect "stephan @rename-it.nl";
-redirect "stephan@ rename-it.nl";
-redirect "stephan@rename-it.nl ";
-redirect " stephan @ rename-it.nl ";
-redirect "Stephan Bosch<stephan@rename-it.nl>";
-redirect " Stephan Bosch<stephan@rename-it.nl>";
-redirect "Stephan Bosch <stephan@rename-it.nl>";
-redirect "Stephan Bosch< stephan@rename-it.nl>";
-redirect "Stephan Bosch<stephan @rename-it.nl>";
-redirect "Stephan Bosch<stephan@ rename-it.nl>";
-redirect "Stephan Bosch<stephan@rename-it.nl >";
-redirect "Stephan Bosch<stephan@rename-it.nl> ";
-redirect " Stephan Bosch < stephan @ rename-it.nl > ";
+redirect "stephan@example.org";
+redirect " stephan@example.org";
+redirect "stephan @example.org";
+redirect "stephan@ example.org";
+redirect "stephan@example.org ";
+redirect " stephan @ example.org ";
+redirect "Stephan Bosch<stephan@example.org>";
+redirect " Stephan Bosch<stephan@example.org>";
+redirect "Stephan Bosch <stephan@example.org>";
+redirect "Stephan Bosch< stephan@example.org>";
+redirect "Stephan Bosch<stephan @example.org>";
+redirect "Stephan Bosch<stephan@ example.org>";
+redirect "Stephan Bosch<stephan@example.org >";
+redirect "Stephan Bosch<stephan@example.org> ";
+redirect " Stephan Bosch < stephan @ example.org > ";
# Test address syntax
-redirect "\"Stephan Bosch\"@rename-it.nl";
-redirect "Stephan.Bosch@rename-it.nl";
-redirect "Stephan.Bosch@ReNaMe-It.Nl";
-redirect "Stephan Bosch <stephan@rename-it.nl>";
+redirect "\"Stephan Bosch\"@example.org";
+redirect "Stephan.Bosch@eXamPle.oRg";
+redirect "Stephan.Bosch@example.org";
+redirect "Stephan Bosch <stephan@example.org>";
diff --git a/tests/compile/warnings/invalid-headers.sieve b/tests/compile/warnings/invalid-headers.sieve
index e82c4744a..d3fc1a38a 100644
--- a/tests/compile/warnings/invalid-headers.sieve
+++ b/tests/compile/warnings/invalid-headers.sieve
@@ -1,8 +1,8 @@
-if header "from:" "frop@rename-it.nl" {
+if header "from:" "frop@example.org" {
stop;
}
-if address "from:" "frop@rename-it.nl" {
+if address "from:" "frop@example.org" {
stop;
}
diff --git a/tests/control-structures.svtest b/tests/control-structures.svtest
index 8459df2fb..7fb2bd5a4 100644
--- a/tests/control-structures.svtest
+++ b/tests/control-structures.svtest
@@ -1,8 +1,8 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan@rename-it.nl
-To: test@dovecot.org
+From: stephan@example.org
+To: test@dovecot.example.net
Subject: Test
Test!
@@ -41,31 +41,31 @@ test "ELSEIF-false" {
}
test "IF-address-true" {
- if address :is "from" "stephan@rename-it.nl" {
+ if address :is "from" "stephan@example.org" {
} else {
test_fail "executed wrong alternative";
}
}
test "IF-address-false" {
- if address :is "from" "tss@iki.fi" {
+ if address :is "from" "tss@example.net" {
test_fail "executed wrong alternative";
}
}
test "ELSEIF-address-true" {
- if address :is "from" "tss@iki.fi" {
+ if address :is "from" "tss@example.net" {
test_fail "executed wrong alternative (if)";
- } elsif address :is "from" "stephan@rename-it.nl" {
+ } elsif address :is "from" "stephan@example.org" {
} else {
test_fail "executed wrong alternative (else)";
}
}
test "ELSEIF-address-false" {
- if address :is "from" "tss@iki.fi" {
+ if address :is "from" "tss@example.net" {
test_fail "executed wrong alternative (if)";
- } elsif address :is "to" "stephan@rename-it.nl" {
+ } elsif address :is "to" "stephan@example.org" {
test_fail "executed wrong alternative (elsif)";
} else {
}
diff --git a/tests/deprecated/notify/basic.svtest b/tests/deprecated/notify/basic.svtest
index 72eed3682..15886d658 100644
--- a/tests/deprecated/notify/basic.svtest
+++ b/tests/deprecated/notify/basic.svtest
@@ -7,5 +7,5 @@ test "Execute" {
:message "This is probably very important"
:low
:method "mailto"
- :options ["stephan@example.com", "stephan@rename-it.nl"];
+ :options ["stephan@example.com", "stephan@example.org"];
}
diff --git a/tests/deprecated/notify/denotify.svtest b/tests/deprecated/notify/denotify.svtest
index 7b2ff619d..72b30bb42 100644
--- a/tests/deprecated/notify/denotify.svtest
+++ b/tests/deprecated/notify/denotify.svtest
@@ -7,8 +7,8 @@ require "envelope";
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -17,8 +17,8 @@ Klutsefluts.
test "Denotify All" {
notify :options "timo@example.com";
- notify :options "stephan@dovecot.org";
- notify :options "postmaster@vestingbar.nl";
+ notify :options "stephan@dovecot.example.net";
+ notify :options "postmaster@frop.example.org";
denotify;
if not test_result_execute {
@@ -37,8 +37,8 @@ test "Denotify All" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -50,10 +50,10 @@ test "Denotify ID First" {
notify :options "timo@example.com" :id "aap";
/* #2 */
- notify :options "stephan@dovecot.org" :id "noot";
+ notify :options "stephan@dovecot.example.net" :id "noot";
/* #3 */
- notify :options "postmaster@vestingbar.nl" :id "mies";
+ notify :options "postmaster@frop.example.org" :id "mies";
denotify :is "aap";
@@ -65,7 +65,7 @@ test "Denotify ID First" {
test_fail "two notifications should have been sent (#2 missing)";
}
- if not envelope "to" "stephan@dovecot.org" {
+ if not envelope "to" "stephan@dovecot.example.net" {
test_fail "message #2 unexpectedly missing from output";
}
@@ -73,7 +73,7 @@ test "Denotify ID First" {
test_fail "two notifications should have been sent (#3 missing)";
}
- if not envelope "to" "postmaster@vestingbar.nl" {
+ if not envelope "to" "postmaster@frop.example.org" {
test_fail "message #3 unexpectedly missing from output";
}
@@ -89,8 +89,8 @@ test "Denotify ID First" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -102,10 +102,10 @@ test "Denotify ID Middle" {
notify :options "timo@example.com" :id "aap";
/* #2 */
- notify :options "stephan@dovecot.org" :id "noot";
+ notify :options "stephan@dovecot.example.net" :id "noot";
/* #3 */
- notify :options "postmaster@vestingbar.nl" :id "mies";
+ notify :options "postmaster@frop.example.org" :id "mies";
denotify :is "noot";
@@ -125,7 +125,7 @@ test "Denotify ID Middle" {
test_fail "two notifications should have been sent (#3 missing)";
}
- if not envelope "to" "postmaster@vestingbar.nl" {
+ if not envelope "to" "postmaster@frop.example.org" {
test_fail "message #3 unexpectedly missing from output";
}
@@ -141,8 +141,8 @@ test "Denotify ID Middle" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -154,10 +154,10 @@ test "Denotify ID Last" {
notify :options "timo@example.com" :id "aap";
/* #2 */
- notify :options "stephan@dovecot.org" :id "noot";
+ notify :options "stephan@dovecot.example.net" :id "noot";
/* #3 */
- notify :options "postmaster@vestingbar.nl" :id "mies";
+ notify :options "postmaster@frop.example.org" :id "mies";
denotify :is "mies";
@@ -177,7 +177,7 @@ test "Denotify ID Last" {
test_fail "two notifications should have been sent (#2 missing)";
}
- if not envelope "to" "stephan@dovecot.org" {
+ if not envelope "to" "stephan@dovecot.example.net" {
test_fail "message #2 unexpectedly missing from output";
}
@@ -194,8 +194,8 @@ test "Denotify ID Last" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -207,10 +207,10 @@ test "Denotify Matching" {
notify :options "timo@example.com" :id "frop";
/* #2 */
- notify :options "stephan@dovecot.org" :id "noot";
+ notify :options "stephan@dovecot.example.net" :id "noot";
/* #3 */
- notify :options "postmaster@vestingbar.nl" :id "friep";
+ notify :options "postmaster@frop.example.org" :id "friep";
denotify :matches "fr*";
@@ -222,7 +222,7 @@ test "Denotify Matching" {
test_fail "one notification should have been sent";
}
- if not envelope "to" "stephan@dovecot.org" {
+ if not envelope "to" "stephan@dovecot.example.net" {
test_fail "message #2 unexpectedly missing from output";
}
@@ -239,8 +239,8 @@ test "Denotify Matching" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -252,10 +252,10 @@ test "Denotify Matching Importance" {
notify :options "timo@example.com" :id "frop" :low;
/* #2 */
- notify :options "stephan@dovecot.org" :id "frml" :high;
+ notify :options "stephan@dovecot.example.net" :id "frml" :high;
/* #3 */
- notify :options "postmaster@vestingbar.nl" :id "friep" :low;
+ notify :options "postmaster@frop.example.org" :id "friep" :low;
denotify :matches "fr*" :low;
@@ -267,7 +267,7 @@ test "Denotify Matching Importance" {
test_fail "one notification should have been sent";
}
- if not envelope "to" "stephan@dovecot.org" {
+ if not envelope "to" "stephan@dovecot.example.net" {
test_fail "message #2 unexpectedly missing from output";
}
diff --git a/tests/deprecated/notify/errors/options.sieve b/tests/deprecated/notify/errors/options.sieve
index e93741b39..c86fea071 100644
--- a/tests/deprecated/notify/errors/options.sieve
+++ b/tests/deprecated/notify/errors/options.sieve
@@ -4,8 +4,8 @@ require "notify";
notify :options "";
# 2: invalid address syntax
-notify :options "frop#vestingbar.nl";
+notify :options "frop#frop.example.org";
# Valid
-notify :options "frop@vestingbar.nl";
+notify :options "frop@frop.example.org";
diff --git a/tests/deprecated/notify/execute/duplicates.sieve b/tests/deprecated/notify/execute/duplicates.sieve
index 8f185c3fc..ef3fa5fd0 100644
--- a/tests/deprecated/notify/execute/duplicates.sieve
+++ b/tests/deprecated/notify/execute/duplicates.sieve
@@ -1,4 +1,4 @@
require "notify";
-notify :message "Incoming stupidity." :options ["stephan@rename-it.nl", "stephan@drunksnipers.com", "idiot@rename-it.nl"];
-notify :message "There it is." :options ["tss@iki.fi", "stephan@rename-it.nl", "idiot@rename-it.nl", "nico@vestingbar.nl", "stephan@drunksnipers.com"];
+notify :message "Incoming stupidity." :options ["stephan@example.org", "stephan@friep.example.com", "idiot@example.org"];
+notify :message "There it is." :options ["tss@example.net", "stephan@example.org", "idiot@example.org", "nico@frop.example.org", "stephan@friep.example.com"];
diff --git a/tests/deprecated/notify/mailto.svtest b/tests/deprecated/notify/mailto.svtest
index ac63c9bd8..e8da42777 100644
--- a/tests/deprecated/notify/mailto.svtest
+++ b/tests/deprecated/notify/mailto.svtest
@@ -10,8 +10,8 @@ require "comparator-i;ascii-numeric";
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -19,7 +19,7 @@ Klutsefluts.
;
test "Simple" {
- notify :method "mailto" :options "stephan@rename-it.nl";
+ notify :method "mailto" :options "stephan@example.org";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -43,8 +43,8 @@ test "Simple" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -52,7 +52,7 @@ Klutsefluts.
;
test "Multiple recipients" {
- notify :options ["timo@example.com","stephan@dovecot.org","postmaster@vestingbar.nl"];
+ notify :options ["timo@example.com","stephan@dovecot.example.net","postmaster@frop.example.org"];
if not test_result_execute {
test_fail "failed to execute notify";
@@ -66,7 +66,7 @@ test "Multiple recipients" {
test_message :smtp 1;
- if not address :is "to" "stephan@dovecot.org" {
+ if not address :is "to" "stephan@dovecot.example.net" {
test_fail "second To address missing";
}
@@ -76,7 +76,7 @@ test "Multiple recipients" {
test_message :smtp 2;
- if not address :is "to" "postmaster@vestingbar.nl" {
+ if not address :is "to" "postmaster@frop.example.org" {
test_fail "third To address missing";
}
@@ -100,8 +100,8 @@ test "Multiple recipients" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -109,8 +109,8 @@ Klutsefluts.
;
test "Duplicate recipients" {
- notify :options ["timo@example.com", "stephan@dovecot.org", "stephan@dovecot.org"];
- notify :options ["timo@example.com", "stephan@rename-it.nl"];
+ notify :options ["timo@example.com", "stephan@dovecot.example.net", "stephan@dovecot.example.net"];
+ notify :options ["timo@example.com", "stephan@example.org"];
if not test_result_execute {
test_fail "failed to execute notify";
@@ -118,7 +118,7 @@ test "Duplicate recipients" {
test_message :smtp 2;
- if address "To" "stephan@dovecot.org" {
+ if address "To" "stephan@dovecot.example.net" {
test_fail "duplicate recipient not removed from first message";
}
@@ -134,8 +134,8 @@ test "Duplicate recipients" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Auto-submitted: auto-notify
Subject: Frop!
@@ -144,7 +144,7 @@ Klutsefluts.
;
test "Notifying on automated messages" {
- notify :options "stephan@rename-it.nl";
+ notify :options "stephan@example.org";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -158,8 +158,8 @@ test "Notifying on automated messages" {
test_result_reset;
test_set "message" text:
-To: nico@vestingbar.nl
-From: stephan@rename-it.nl
+To: nico@frop.example.org
+From: stephan@example.org
Subject: Test
Test. Test
@@ -168,7 +168,7 @@ Frop!
;
test "Body; Singular Message" {
- notify :low :id "frop" :options "stephan@rename-it.nl"
+ notify :low :id "frop" :options "stephan@example.org"
:message text:
Received interesting message:
@@ -202,8 +202,8 @@ You have been notified.
test_result_reset;
test_set "message" text:
-To: nico@vestingbar.nl
-From: stephan@rename-it.nl
+To: nico@frop.example.org
+From: stephan@example.org
Subject: Test
Test. Test
@@ -212,7 +212,7 @@ Frop!
;
test "Body; $text[maxsize]$" {
- notify :low :id "frop" :options "sirius@rename-it.nl"
+ notify :low :id "frop" :options "sirius@example.org"
:message text:
Received interesting message:
@@ -292,7 +292,7 @@ This is the end of the outer MIME multipart.
;
test "Body; Multipart Message" {
- notify :low :id "frop" :options "stephan@rename-it.nl"
+ notify :low :id "frop" :options "stephan@example.org"
:message text:
Received interesting message:
diff --git a/tests/execute/actions.svtest b/tests/execute/actions.svtest
index 576ffb456..ab70db929 100644
--- a/tests/execute/actions.svtest
+++ b/tests/execute/actions.svtest
@@ -3,8 +3,8 @@ require "relational";
require "comparator-i;ascii-numeric";
test_set "message" text:
-To: nico@vestingbar.nl
-From: stephan@rename-it.nl
+To: nico@frop.example.org
+From: stephan@example.org
Subject: Test
Test.
diff --git a/tests/execute/actions/fileinto.sieve b/tests/execute/actions/fileinto.sieve
index c58af8691..e9c133b97 100644
--- a/tests/execute/actions/fileinto.sieve
+++ b/tests/execute/actions/fileinto.sieve
@@ -2,7 +2,7 @@ require "fileinto";
/* Three store actions */
-if address :contains "to" "vestingbar" {
+if address :contains "to" "frop.example" {
/* #1 */
fileinto "INBOX.VB";
}
diff --git a/tests/execute/actions/redirect.sieve b/tests/execute/actions/redirect.sieve
index 601faf986..a88a0a8c4 100644
--- a/tests/execute/actions/redirect.sieve
+++ b/tests/execute/actions/redirect.sieve
@@ -1,4 +1,4 @@
-if address :contains "to" "vestingbar" {
+if address :contains "to" "frop.example" {
/* #1 */
redirect "stephan@example.com";
@@ -7,7 +7,7 @@ if address :contains "to" "vestingbar" {
}
/* #3 */
-redirect "stephan@rename-it.nl";
+redirect "stephan@example.org";
/* #4 */
redirect "nico@example.nl";
diff --git a/tests/execute/mailstore.svtest b/tests/execute/mailstore.svtest
index 5ecdaa883..457bb93fd 100644
--- a/tests/execute/mailstore.svtest
+++ b/tests/execute/mailstore.svtest
@@ -4,8 +4,8 @@ require "variables";
require "mailbox";
set "message1" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: First message
Frop
@@ -13,8 +13,8 @@ Frop
;
set "message2" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Second message
Frop
@@ -22,8 +22,8 @@ Frop
;
set "message3" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Third message
Frop
diff --git a/tests/execute/smtp.svtest b/tests/execute/smtp.svtest
index c45f0814e..70fb7f5fb 100644
--- a/tests/execute/smtp.svtest
+++ b/tests/execute/smtp.svtest
@@ -2,19 +2,19 @@ require "vnd.dovecot.testsuite";
require "envelope";
test_set "message" text:
-From: stephan@rename-it.nl
-To: tss@iki.fi
+From: stephan@example.org
+To: tss@example.net
Subject: Frop!
Frop!
.
;
-test_set "envelope.from" "sirius@rename-it.nl";
-test_set "envelope.to" "timo@iki.fi";
+test_set "envelope.from" "sirius@example.org";
+test_set "envelope.to" "timo@example.net";
test "Redirect" {
- redirect "cras@iki.fi";
+ redirect "cras@example.net";
if not test_result_execute {
test_fail "failed to execute redirect";
@@ -22,19 +22,19 @@ test "Redirect" {
test_message :smtp 0;
- if not address :is "to" "tss@iki.fi" {
+ if not address :is "to" "tss@example.net" {
test_fail "to address incorrect (strange forward)";
}
- if not address :is "from" "stephan@rename-it.nl" {
+ if not address :is "from" "stephan@example.org" {
test_fail "from address incorrect (strange forward)";
}
- if not envelope :is "to" "cras@iki.fi" {
+ if not envelope :is "to" "cras@example.net" {
test_fail "envelope recipient incorrect";
}
- if not envelope :is "from" "sirius@rename-it.nl" {
+ if not envelope :is "from" "sirius@example.org" {
test_fail "envelope sender incorrect";
}
}
@@ -45,13 +45,13 @@ test "Redirect from <>" {
test_set "envelope.from" "<>";
- redirect "cras@iki.fi";
+ redirect "cras@example.net";
if not test_result_execute {
test_fail "failed to execute redirect";
}
- if envelope :is "from" "sirius@rename-it.nl" {
+ if envelope :is "from" "sirius@example.org" {
test_fail "envelope sender incorrect (not changed)";
}
diff --git a/tests/exists.svtest b/tests/exists.svtest
index f215cf826..50aedb422 100644
--- a/tests/exists.svtest
+++ b/tests/exists.svtest
@@ -1,11 +1,11 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan@rename-it.nl
+From: stephan@example.org
To: nico@vestingbar.bl
Subject: Test message
X-Spam-Status: Not Spam
-Resent-To: nico@vestingbar.nl
+Resent-To: nico@frop.example.com
Test!
.
diff --git a/tests/extensions/body/basic.svtest b/tests/extensions/body/basic.svtest
index fccf59767..a70678ff3 100644
--- a/tests/extensions/body/basic.svtest
+++ b/tests/extensions/body/basic.svtest
@@ -5,8 +5,8 @@ require "comparator-i;ascii-numeric";
require "body";
test_set "message" text:
-From: stephan@rename-it.nl
-To: tss@iki.fi
+From: stephan@example.org
+To: tss@example.net
Subject: Test message.
Test!
@@ -76,8 +76,8 @@ test "Defaults" {
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: tss@iki.fi
+From: stephan@example.org
+To: tss@example.net
Subject: No body is here!
.
;
diff --git a/tests/extensions/body/match-values.svtest b/tests/extensions/body/match-values.svtest
index 87e11177e..55d553580 100644
--- a/tests/extensions/body/match-values.svtest
+++ b/tests/extensions/body/match-values.svtest
@@ -4,8 +4,8 @@ require "body";
require "variables";
test_set "message" text:
-From: stephan@rename-it.nl
-To: s.bosch@utwente.nl
+From: stephan@example.org
+To: s.bosch@twente.example.net
Subject: Body test
The big bad body test.
@@ -34,9 +34,9 @@ test "Match values re-enabled" {
}
if anyof (
- not string :is "${0}" "stephan@rename-it.nl",
+ not string :is "${0}" "stephan@example.org",
not string :is "${1}" "stephan",
- not string :is "${2}" "rename-it.nl" ) {
+ not string :is "${2}" "example.org" ) {
test_fail "match values not re-enabled properly.";
}
}
@@ -47,9 +47,9 @@ test "Match values retained" {
}
if anyof (
- not string :is "${0}" "stephan@rename-it.nl",
+ not string :is "${0}" "stephan@example.org",
not string :is "${1}" "stephan",
- not string :is "${2}" "rename-it.nl" ) {
+ not string :is "${2}" "example.org" ) {
test_fail "match values not retained after body test.";
}
}
diff --git a/tests/extensions/date/basic.svtest b/tests/extensions/date/basic.svtest
index 43d8cf08d..9ecfd45be 100644
--- a/tests/extensions/date/basic.svtest
+++ b/tests/extensions/date/basic.svtest
@@ -4,8 +4,8 @@ require "variables";
require "relational";
test_set "message" text:
-From: stephan@rename-it.nl
-To: sirius@drunksnipers.com
+From: stephan@example.org
+To: sirius@friep.example.com
Subject: Frop!
Date: Mon, 20 Jul 2009 21:44:43 +0300
Delivery-Date: Mon, 22 Jul 2009 23:30:14 +0300
diff --git a/tests/extensions/date/date-parts.svtest b/tests/extensions/date/date-parts.svtest
index ecd0e1226..edc565c55 100644
--- a/tests/extensions/date/date-parts.svtest
+++ b/tests/extensions/date/date-parts.svtest
@@ -3,8 +3,8 @@ require "date";
require "variables";
test_set "message" text:
-From: stephan@rename-it.nl
-To: sirius@drunksnipers.com
+From: stephan@example.org
+To: sirius@friep.example.com
Subject: Frop!
Date: Mon, 20 Jul 2009 21:44:43 +0300
Delivery-Date: Mon, 22 Jul 2009 23:30:14 +0300
diff --git a/tests/extensions/date/zones.svtest b/tests/extensions/date/zones.svtest
index 1f55e3644..471011aaa 100644
--- a/tests/extensions/date/zones.svtest
+++ b/tests/extensions/date/zones.svtest
@@ -13,8 +13,8 @@ test "Local-Zone" {
/* FIXME: using variables somehow fails here */
if string "${local_zone}" "+0200" {
test_set "message" text:
-From: stephan@rename-it.nl
-To: sirius@drunksnipers.com
+From: stephan@example.org
+To: sirius@friep.example.com
Subject: Frop!
Date: Mon, 20 Jul 2009 21:44:43 +0300
Delivery-Date: Mon, 23 Jul 2009 05:30:14 +0800
@@ -24,8 +24,8 @@ Wanna date?
;
} else {
test_set "message" text:
-From: stephan@rename-it.nl
-To: sirius@drunksnipers.com
+From: stephan@example.org
+To: sirius@friep.example.com
Subject: Frop!
Date: Mon, 20 Jul 2009 21:44:43 +0300
Delivery-Date: Mon, 22 Jul 2009 23:30:14 +0200
diff --git a/tests/extensions/enotify/basic.svtest b/tests/extensions/enotify/basic.svtest
index 052be61b7..80bb93657 100644
--- a/tests/extensions/enotify/basic.svtest
+++ b/tests/extensions/enotify/basic.svtest
@@ -10,6 +10,6 @@ test "Execute" {
notify
:message "This is probably very important"
:importance "1"
- "mailto:stephan@example.com%2cstephan@rename-it.nl?subject=Important%20message%20received";
+ "mailto:stephan@example.com%2cstephan@example.org?subject=Important%20message%20received";
}
}
diff --git a/tests/extensions/enotify/errors/from-mailto.sieve b/tests/extensions/enotify/errors/from-mailto.sieve
index 7046040eb..d5192562f 100644
--- a/tests/extensions/enotify/errors/from-mailto.sieve
+++ b/tests/extensions/enotify/errors/from-mailto.sieve
@@ -1,7 +1,7 @@
require "enotify";
# 1: Invalid from address
-notify :from "stephan#rename-it.nl" "mailto:stephan@example.com";
+notify :from "stephan#example.org" "mailto:stephan@example.com";
# 2: Empty from address
notify :from "" "mailto:stephan@example.com";
diff --git a/tests/extensions/enotify/errors/options.sieve b/tests/extensions/enotify/errors/options.sieve
index 8c84632f8..58d22652d 100644
--- a/tests/extensions/enotify/errors/options.sieve
+++ b/tests/extensions/enotify/errors/options.sieve
@@ -1,18 +1,18 @@
require "enotify";
# 1: empty option
-notify :options "" "mailto:stephan@rename-it.nl";
+notify :options "" "mailto:stephan@example.org";
# 2: invalid option name syntax
-notify :options "frop" "mailto:stephan@rename-it.nl";
+notify :options "frop" "mailto:stephan@example.org";
# 3: invalid option name syntax
-notify :options "_frop=" "mailto:stephan@rename-it.nl";
+notify :options "_frop=" "mailto:stephan@example.org";
# 4: invalid option name syntax
-notify :options "=frop" "mailto:stephan@rename-it.nl";
+notify :options "=frop" "mailto:stephan@example.org";
# 5: invalid value
notify :options "frop=frml
-frop" "mailto:stephan@rename-it.nl";
+frop" "mailto:stephan@example.org";
diff --git a/tests/extensions/enotify/errors/uri-mailto.sieve b/tests/extensions/enotify/errors/uri-mailto.sieve
index d272fe060..f29b472ee 100644
--- a/tests/extensions/enotify/errors/uri-mailto.sieve
+++ b/tests/extensions/enotify/errors/uri-mailto.sieve
@@ -1,20 +1,20 @@
require "enotify";
# 1: Invalid character in to part
-notify "mailto:stephan@rename-it.nl;?header=frop";
+notify "mailto:stephan@example.org;?header=frop";
# 2: Invalid character in hname
-notify "mailto:stephan@rename-it.nl?header<=frop";
+notify "mailto:stephan@example.org?header<=frop";
# 3: Invalid character in hvalue
-notify "mailto:stephan@rename-it.nl?header=fr>op";
+notify "mailto:stephan@example.org?header=fr>op";
# 4: Invalid header name
-notify "mailto:stephan@rename-it.nl?header:=frop";
+notify "mailto:stephan@example.org?header:=frop";
# 5: Invalid recipient
-notify "mailto:stephan%23rename-it.nl";
+notify "mailto:stephan%23example.org";
# 6: Invalid to header recipient
-notify "mailto:stephan@rename-it.nl?to=nico%23vestingbar.nl";
+notify "mailto:stephan@example.org?to=nico%23frop.example.org";
diff --git a/tests/extensions/enotify/errors/uri.sieve b/tests/extensions/enotify/errors/uri.sieve
index 06e86d764..13ead8144 100644
--- a/tests/extensions/enotify/errors/uri.sieve
+++ b/tests/extensions/enotify/errors/uri.sieve
@@ -1,5 +1,5 @@
require "enotify";
# 1: Invalid url scheme
-notify "snailto:stephan@rename-it.nl";
+notify "snailto:stephan@example.org";
diff --git a/tests/extensions/enotify/execute/duplicates.sieve b/tests/extensions/enotify/execute/duplicates.sieve
index 2bed19aa7..17f2388f2 100644
--- a/tests/extensions/enotify/execute/duplicates.sieve
+++ b/tests/extensions/enotify/execute/duplicates.sieve
@@ -1,4 +1,4 @@
require "enotify";
-notify :message "Incoming stupidity." "mailto:stephan@rename-it.nl%2cstephan@drunksnipers.com%2cidiot@rename-it.nl";
-notify :message "There it is." "mailto:tss@iki.fi%2cstephan@rename-it.nl%2cidiot@rename-it.nl%2cnico@vestingbar.nl%2cstephan@drunksnipers.com";
+notify :message "Incoming stupidity." "mailto:stephan@example.org%2cstephan@friep.example.com%2cidiot@example.org";
+notify :message "There it is." "mailto:tss@example.net%2cstephan@example.org%2cidiot@example.org%2cnico@frop.example.org%2cstephan@friep.example.com";
diff --git a/tests/extensions/enotify/mailto.svtest b/tests/extensions/enotify/mailto.svtest
index 11dd998ca..0535e95da 100644
--- a/tests/extensions/enotify/mailto.svtest
+++ b/tests/extensions/enotify/mailto.svtest
@@ -9,8 +9,8 @@ require "comparator-i;ascii-numeric";
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -18,7 +18,7 @@ Klutsefluts.
;
test "Simple" {
- notify "mailto:stephan@rename-it.nl";
+ notify "mailto:stephan@example.org";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -49,8 +49,8 @@ test "Simple" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -58,7 +58,7 @@ Klutsefluts.
;
test "Multiple recipients" {
- notify "mailto:timo@example.com%2cstephan@dovecot.org?cc=postmaster@vestingbar.nl&subject=Frop%20received";
+ notify "mailto:timo@example.com%2cstephan@dovecot.example.net?cc=postmaster@frop.example.org&subject=Frop%20received";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -70,11 +70,11 @@ test "Multiple recipients" {
test_fail "first To address missing";
}
- if not address :is "to" "stephan@dovecot.org" {
+ if not address :is "to" "stephan@dovecot.example.net" {
test_fail "second To address missing";
}
- if not address :is "cc" "postmaster@vestingbar.nl" {
+ if not address :is "cc" "postmaster@frop.example.org" {
test_fail "first Cc address missing";
}
@@ -110,8 +110,8 @@ test "Multiple recipients" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -119,8 +119,8 @@ Klutsefluts.
;
test "Duplicate recipients" {
- notify "mailto:timo@example.com%2cstephan@dovecot.org?cc=stephan@dovecot.org";
- notify "mailto:stephan@rename-it.nl?cc=timo@example.com";
+ notify "mailto:timo@example.com%2cstephan@dovecot.example.net?cc=stephan@dovecot.example.net";
+ notify "mailto:stephan@example.org?cc=timo@example.com";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -128,7 +128,7 @@ test "Duplicate recipients" {
test_message :smtp 0;
- if address "Cc" "stephan@dovecot.org" {
+ if address "Cc" "stephan@dovecot.example.net" {
test_fail "duplicate recipient not removed from first message";
}
@@ -147,8 +147,8 @@ test "Duplicate recipients" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Auto-submitted: auto-notify
Subject: Frop!
@@ -157,7 +157,7 @@ Klutsefluts.
;
test "Notifying on automated messages" {
- notify "mailto:stephan@rename-it.nl?cc=timo@example.com";
+ notify "mailto:stephan@example.org?cc=timo@example.com";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -173,8 +173,8 @@ test "Notifying on automated messages" {
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -183,11 +183,11 @@ Klutsefluts.
test_result_reset;
-test_set "envelope.from" "sirius@rename-it.nl";
-test_set "envelope.to" "bertus@vestingbar.nl";
+test_set "envelope.from" "sirius@example.org";
+test_set "envelope.to" "bertus@frop.example.org";
test "Envelope" {
- notify "mailto:stephan@rename-it.nl?cc=timo@example.com";
+ notify "mailto:stephan@example.org?cc=timo@example.com";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -199,7 +199,7 @@ test "Envelope" {
test_fail "envelope sender set incorrectly";
}
- if not envelope :is "to" "stephan@rename-it.nl" {
+ if not envelope :is "to" "stephan@example.org" {
test_fail "envelope sender set incorrectly";
}
@@ -219,22 +219,22 @@ test "Envelope" {
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
.
;
-test_set "envelope.from" "sirius@rename-it.nl";
-test_set "envelope.to" "bertus@vestingbar.nl";
+test_set "envelope.from" "sirius@example.org";
+test_set "envelope.to" "bertus@frop.example.org";
test_result_reset;
test "Envelope :from" {
- notify :from "nico@vestingbar.nl"
- "mailto:stephan@rename-it.nl?cc=timo@example.com";
+ notify :from "nico@frop.example.org"
+ "mailto:stephan@example.org?cc=timo@example.com";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -242,17 +242,17 @@ test "Envelope :from" {
test_message :smtp 0;
- if not envelope :is "from" "nico@vestingbar.nl" {
+ if not envelope :is "from" "nico@frop.example.org" {
test_fail "envelope sender set incorrectly";
}
- if not envelope :is "to" "stephan@rename-it.nl" {
+ if not envelope :is "to" "stephan@example.org" {
test_fail "envelope sender set incorrectly";
}
test_message :smtp 1;
- if not envelope :is "from" "nico@vestingbar.nl" {
+ if not envelope :is "from" "nico@frop.example.org" {
test_fail "envelope sender set incorrectly";
}
@@ -266,8 +266,8 @@ test "Envelope :from" {
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop!
Klutsefluts.
@@ -275,13 +275,13 @@ Klutsefluts.
;
test_set "envelope.from" "<>";
-test_set "envelope.to" "bertus@vestingbar.nl";
+test_set "envelope.to" "bertus@frop.example.org";
test_result_reset;
test "Envelope <>" {
- notify :from "nico@vestingbar.nl"
- "mailto:stephan@rename-it.nl?cc=timo@example.com";
+ notify :from "nico@frop.example.org"
+ "mailto:stephan@example.org?cc=timo@example.com";
if not test_result_execute {
test_fail "failed to execute notify";
@@ -293,7 +293,7 @@ test "Envelope <>" {
test_fail "envelope sender set incorrectly";
}
- if not envelope :is "to" "stephan@rename-it.nl" {
+ if not envelope :is "to" "stephan@example.org" {
test_fail "envelope sender set incorrectly";
}
diff --git a/tests/extensions/enotify/notify_method_capability.svtest b/tests/extensions/enotify/notify_method_capability.svtest
index 9cdb2bef0..0d134772d 100644
--- a/tests/extensions/enotify/notify_method_capability.svtest
+++ b/tests/extensions/enotify/notify_method_capability.svtest
@@ -2,11 +2,11 @@ require "vnd.dovecot.testsuite";
require "enotify";
test "Mailto" {
- if not notify_method_capability :is "mailto:stephan@rename-it.nl" "online" "maybe" {
+ if not notify_method_capability :is "mailto:stephan@example.org" "online" "maybe" {
test_fail "test should have matched";
}
- if notify_method_capability :is "mailto:stephan@rename-it.nl" "online" "yes" {
+ if notify_method_capability :is "mailto:stephan@example.org" "online" "yes" {
test_fail "test should not have matched";
}
}
diff --git a/tests/extensions/enotify/valid_notify_method.svtest b/tests/extensions/enotify/valid_notify_method.svtest
index 505442fcc..4d247705f 100644
--- a/tests/extensions/enotify/valid_notify_method.svtest
+++ b/tests/extensions/enotify/valid_notify_method.svtest
@@ -4,28 +4,28 @@ require "enotify";
test "Mailto: invalid header name" {
if valid_notify_method
- "mailto:stephan@rename-it.nl?header:=frop" {
+ "mailto:stephan@example.org?header:=frop" {
test_fail "invalid uri accepted";
}
}
test "Mailto: invalid recipient" {
if valid_notify_method
- "mailto:stephan%23rename-it.nl" {
+ "mailto:stephan%23example.org" {
test_fail "invalid uri accepted";
}
}
test "Mailto: invalid to header recipient" {
if valid_notify_method
- "mailto:stephan@rename-it.nl?to=nico%23vestingbar.nl" {
+ "mailto:stephan@example.org?to=nico%23frop.example.org" {
test_fail "invalid uri accepted";
}
}
test "Mailto: valid URI" {
if not valid_notify_method
- "mailto:stephan@rename-it.nl" {
+ "mailto:stephan@example.org" {
test_fail "valid uri denied";
}
}
diff --git a/tests/extensions/envelope.svtest b/tests/extensions/envelope.svtest
index 356ac8e77..32c46e03a 100644
--- a/tests/extensions/envelope.svtest
+++ b/tests/extensions/envelope.svtest
@@ -47,7 +47,7 @@ test "Envelope - from empty" {
test_fail "failed to (:domain :contains)-match a <> return path";
}
- if envelope :all :is "from" "nico@vestingbar.nl" {
+ if envelope :all :is "from" "nico@frop.example.org" {
test_fail "envelope test matches nonsense";
}
@@ -101,37 +101,37 @@ test "Envelope - invalid paths" {
test "Envelope - syntax errors" {
/* Control */
- test_set "envelope.from" "<stephan@rename-it.nl>";
- if not envelope :all :is "from" "stephan@rename-it.nl" {
+ test_set "envelope.from" "<stephan@example.org>";
+ if not envelope :all :is "from" "stephan@example.org" {
test_fail "correct control test failed";
}
# Duplicate <
- test_set "envelope.from" "<<stephan@rename-it.nl>";
- if envelope :all :is "from" "stephan@rename-it.nl" {
+ test_set "envelope.from" "<<stephan@example.org>";
+ if envelope :all :is "from" "stephan@example.org" {
test_fail "failed to recognize syntax error";
}
# Spurious >
- test_set "envelope.from" "stephan@rename-it.nl>";
- if envelope :all :is "from" "stephan@rename-it.nl" {
+ test_set "envelope.from" "stephan@example.org>";
+ if envelope :all :is "from" "stephan@example.org" {
test_fail "failed to recognize syntax error";
}
# Missing >
- test_set "envelope.from" "<stephan@rename-it.nl";
- if envelope :all :is "from" "stephan@rename-it.nl" {
+ test_set "envelope.from" "<stephan@example.org";
+ if envelope :all :is "from" "stephan@example.org" {
test_fail "failed to recognize syntax error";
}
# No @
- test_set "envelope.from" "<stephan rename-it.nl>";
+ test_set "envelope.from" "<stephan example.org>";
if envelope :domain :contains "from" "" {
test_fail "failed to recognize syntax error";
}
# Duplicate @
- test_set "envelope.from" "<stephan@@rename-it.nl>";
+ test_set "envelope.from" "<stephan@@example.org>";
if envelope :domain :contains "from" "" {
test_fail "failed to recognize syntax error";
}
@@ -143,76 +143,76 @@ test "Envelope - syntax errors" {
test "Envelope - source route" {
/* Single */
- test_set "envelope.from" "<@cola.rename-it.nl:stephan@rename-it.nl>";
+ test_set "envelope.from" "<@cola.example.org:stephan@example.org>";
if not envelope :localpart :is "from" "stephan" {
test_fail "parsing path with source route (single) failed";
}
/* Dual */
- test_set "envelope.from" "<@cola.rename-it.nl,@mx.utwente.nl:stephan@rename-it.nl>";
+ test_set "envelope.from" "<@cola.example.org,@mx.utwente.nl:stephan@example.org>";
if not envelope :localpart :is "from" "stephan" {
test_fail "parsing path with source route (dual) failed";
}
/* Multiple */
- test_set "envelope.from" "<@cola.rename-it.nl,@mx.utwente.nl,@smtp.iki.fi:stephan@rename-it.nl>";
+ test_set "envelope.from" "<@cola.example.org,@mx.utwente.nl,@smtp.example.net:stephan@example.org>";
if not envelope :localpart :is "from" "stephan" {
test_fail "parsing path with source route (multiple) failed";
}
/* Bare */
- test_set "envelope.from" "@cola.rename-it.nl,@mx.utwente.nl,@smtp.iki.fi:stephan@rename-it.nl";
- if not envelope :domain :is "from" "rename-it.nl" {
+ test_set "envelope.from" "@cola.example.org,@mx.utwente.nl,@smtp.example.net:stephan@example.org";
+ if not envelope :domain :is "from" "example.org" {
test_fail "parsing path with source route (bare) failed";
}
/* Whitespace */
- test_set "envelope.from" " < @ cola . rename-it . nl , @ mx . utwente . nl , @ smtp . iki . fi : stephan @ rename-it . nl > ";
- if not envelope :domain :is "from" "rename-it.nl" {
+ test_set "envelope.from" " < @ cola . example . org , @ mx . utwente . nl , @ smtp . iki . fi : stephan @ example . org > ";
+ if not envelope :domain :is "from" "example.org" {
test_fail "parsing path with source route (whitespace) failed";
}
}
test "Envelope - source route errors" {
- test_set "envelope.to" "<cola.rename-it.nl:stephan@rename-it.nl>";
+ test_set "envelope.to" "<cola.example.org:stephan@example.org>";
if envelope :domain :contains "to" "" {
test_fail "parsing syntactically incorrect path should have failed (1)";
}
- test_set "envelope.to" "<@.rename-it.nl:stephan@rename-it.nl>";
+ test_set "envelope.to" "<@.example.org:stephan@example.org>";
if envelope :domain :contains "to" "" {
test_fail "parsing syntactically incorrect path should have failed (2)";
}
- test_set "envelope.to" "<@cola..nl:stephan@rename-it.nl>";
+ test_set "envelope.to" "<@cola..nl:stephan@example.org>";
if envelope :domain :contains "to" "" {
test_fail "parsing syntactically incorrect path should have failed (3)";
}
- test_set "envelope.to" "<@cola.rename-it.nlstephan@rename-it.nl>";
+ test_set "envelope.to" "<@cola.example.orgstephan@example.org>";
if envelope :domain :contains "to" "" {
test_fail "parsing syntactically incorrect path should have failed (4)";
}
- test_set "envelope.to" "<@cola.rename-it.nl@mx.utwente.nl:stephan@rename-it.nl>";
+ test_set "envelope.to" "<@cola.example.org@mx.utwente.nl:stephan@example.org>";
if envelope :domain :contains "to" "" {
test_fail "parsing syntactically incorrect path should have failed (5)";
}
- test_set "envelope.to" "<@cola.rename-it.nl,mx.utwente.nl:stephan@rename-it.nl>";
+ test_set "envelope.to" "<@cola.example.org,mx.utwente.nl:stephan@example.org>";
if envelope :domain :contains "to" "" {
test_fail "parsing syntactically incorrect path should have failed (6)";
}
- test_set "envelope.to" "<@cola.rename-it.nl,@mx.utwente.nl,stephan@rename-it.nl>";
+ test_set "envelope.to" "<@cola.example.org,@mx.utwente.nl,stephan@example.org>";
if envelope :domain :contains "to" "" {
test_fail "parsing syntactically incorrect path should have failed (7)";
}
- if not envelope :all :is "to" "<@cola.rename-it.nl,@mx.utwente.nl,stephan@rename-it.nl>" {
+ if not envelope :all :is "to" "<@cola.example.org,@mx.utwente.nl,stephan@example.org>" {
test_fail ":all address part mangled syntactically incorrect path";
}
}
diff --git a/tests/extensions/include/execute.svtest b/tests/extensions/include/execute.svtest
index 54f834abe..e45848af4 100644
--- a/tests/extensions/include/execute.svtest
+++ b/tests/extensions/include/execute.svtest
@@ -2,7 +2,7 @@ require "vnd.dovecot.testsuite";
test_set "message" text:
From: idiot@example.com
-To: idiot@rename-it.nl
+To: idiot@example.org
Subject: Frop!
Frop.
diff --git a/tests/extensions/include/included/rfc-ex1-mailing_lists.sieve b/tests/extensions/include/included/rfc-ex1-mailing_lists.sieve
index de148a194..4ccc11d6a 100644
--- a/tests/extensions/include/included/rfc-ex1-mailing_lists.sieve
+++ b/tests/extensions/include/included/rfc-ex1-mailing_lists.sieve
@@ -1,10 +1,10 @@
require ["fileinto"];
-if header :is "Sender" "owner-ietf-mta-filters@imc.org"
+if header :is "Sender" "owner-ietf-mta-filters@imc.example.com"
{
fileinto "lists.sieve";
}
-elsif header :is "Sender" "owner-ietf-imapext@imc.org"
+elsif header :is "Sender" "owner-ietf-imapext@imc.example.com"
{
fileinto "lists.imapext";
}
diff --git a/tests/extensions/mailbox/execute.svtest b/tests/extensions/mailbox/execute.svtest
index 6bea19373..f45486127 100644
--- a/tests/extensions/mailbox/execute.svtest
+++ b/tests/extensions/mailbox/execute.svtest
@@ -37,8 +37,8 @@ test ":Create" {
}
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop 1
Frop!
@@ -58,8 +58,8 @@ Frop!
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.org
Subject: Frop 2
Frop!
diff --git a/tests/extensions/regex/basic.svtest b/tests/extensions/regex/basic.svtest
index 9286a12fc..8a3456d4e 100644
--- a/tests/extensions/regex/basic.svtest
+++ b/tests/extensions/regex/basic.svtest
@@ -3,8 +3,8 @@ require "vnd.dovecot.testsuite";
require "regex";
test_set "message" text:
-From: stephan+sieve@drunksnipers.com
-To: tss@iki.fi
+From: stephan+sieve@friep.example.com
+To: tss@example.net
Subject: Test
Test message.
@@ -13,8 +13,8 @@ Test message.
test "Basic example" {
if not address :regex :comparator "i;ascii-casemap" "from" [
- "stephan(\\+.*)?@rename-it\\.com",
- "stephan(\\+.*)?@drunksnipers\\.com"
+ "stephan(\\+.*)?@it\\.example\\.com",
+ "stephan(\\+.*)?@friep\\.example\\.com"
] {
test_fail "failed to match";
}
diff --git a/tests/extensions/regex/errors/compile.sieve b/tests/extensions/regex/errors/compile.sieve
index 2ff7731ef..5ddaaf8d7 100644
--- a/tests/extensions/regex/errors/compile.sieve
+++ b/tests/extensions/regex/errors/compile.sieve
@@ -2,22 +2,22 @@ require "regex";
require "comparator-i;ascii-numeric";
require "envelope";
-if address :regex :comparator "i;ascii-numeric" "from" "sirius(\\+.*)?@drunksnipers\\.com" {
+if address :regex :comparator "i;ascii-numeric" "from" "sirius(\\+.*)?@friep\\.example\\.com" {
keep;
stop;
}
-if address :regex "from" "sirius(+\\+.*)?@drunksnipers\\.com" {
+if address :regex "from" "sirius(+\\+.*)?@friep\\.example\\.com" {
keep;
stop;
}
-if header :regex "from" "sirius(\\+.*)?@drunk[]snipers.com" {
+if header :regex "from" "sirius(\\+.*)?@friep\\.ex[]ample.com" {
keep;
stop;
}
-if envelope :regex "from" "sirius(\\+.*)?@drunksni[]pers.com" {
+if envelope :regex "from" "sirius(\\+.*)?@friep\\.ex[]ample.com" {
keep;
stop;
}
diff --git a/tests/extensions/regex/match-values.svtest b/tests/extensions/regex/match-values.svtest
index 04506a684..9b3070eeb 100644
--- a/tests/extensions/regex/match-values.svtest
+++ b/tests/extensions/regex/match-values.svtest
@@ -5,8 +5,8 @@ require "variables";
test_set "message" text:
From: Andy Howell <AndyHowell@example.com>
-Sender: antlr-interest-bounces@antlr.org
-To: Stephan Bosch <stephan@rename-it.nl>
+Sender: antlr-interest-bounces@ant.example.com
+To: Stephan Bosch <stephan@example.org>
Subject: [Dovecot] Sieve regex match problem
Hi,
@@ -16,7 +16,7 @@ I is broken.
;
test "Basic match values 1" {
- if header :regex ["Sender"] ["([^-@]*)-([^-@]*)(-bounces)?@antlr.org"] {
+ if header :regex ["Sender"] ["([^-@]*)-([^-@]*)(-bounces)?@ant.example.com"] {
if not string :is "${1}" "antlr" {
test_fail "first match value is not correct";
@@ -37,11 +37,11 @@ test "Basic match values 1" {
}
test "Basic match values 2" {
- if header :regex ["Sender"] ["(.*>[ \\t]*,?[ \\t]*)?([^-@]*)-([^-@]*)(-bounces)?@antlr.org"] {
+ if header :regex ["Sender"] ["(.*>[ \\t]*,?[ \\t]*)?([^-@]*)-([^-@]*)(-bounces)?@ant.example.com"] {
if not string :is "${1}" "" {
- test_fail "first match value is not correct: ${1}";
- }
+ test_fail "first match value is not correct: ${1}";
+ }
if not string :is "${2}" "antlr" {
test_fail "second match value is not correct: ${2}";
diff --git a/tests/extensions/reject/execute.svtest b/tests/extensions/reject/execute.svtest
index bf3f629ad..a9a801cf4 100644
--- a/tests/extensions/reject/execute.svtest
+++ b/tests/extensions/reject/execute.svtest
@@ -3,8 +3,8 @@ require "relational";
require "comparator-i;ascii-numeric";
test_set "message" text:
-To: nico@vestingbar.nl
-From: stephan@rename-it.nl
+To: nico@frop.example.org
+From: stephan@example.org
Subject: Test
Test.
diff --git a/tests/extensions/reject/execute/basic.sieve b/tests/extensions/reject/execute/basic.sieve
index 9e07c84c8..d3b7dc97b 100644
--- a/tests/extensions/reject/execute/basic.sieve
+++ b/tests/extensions/reject/execute/basic.sieve
@@ -1,6 +1,6 @@
require "reject";
-if address :contains "to" "vestingbar" {
+if address :contains "to" "frop.example" {
reject "Don't send unrequested messages.";
stop;
}
diff --git a/tests/extensions/reject/smtp.svtest b/tests/extensions/reject/smtp.svtest
index 6548bc3d9..50424440c 100644
--- a/tests/extensions/reject/smtp.svtest
+++ b/tests/extensions/reject/smtp.svtest
@@ -3,16 +3,16 @@ require "envelope";
require "reject";
test_set "message" text:
-From: stephan@rename-it.nl
-To: tss@iki.fi
+From: stephan@example.org
+To: tss@example.net
Subject: Frop!
Frop!
.
;
-test_set "envelope.from" "sirius@rename-it.nl";
-test_set "envelope.to" "timo@iki.fi";
+test_set "envelope.from" "sirius@example.org";
+test_set "envelope.to" "timo@example.net";
test "Basic" {
reject "I don't want your mail";
@@ -23,7 +23,7 @@ test "Basic" {
test_message :smtp 0;
- if not address :is "to" "sirius@rename-it.nl" {
+ if not address :is "to" "sirius@example.org" {
test_fail "to address incorrect";
}
@@ -31,7 +31,7 @@ test "Basic" {
test_fail "from address incorrect";
}
- if not envelope :is "to" "sirius@rename-it.nl" {
+ if not envelope :is "to" "sirius@example.org" {
test_fail "envelope recipient incorrect";
}
diff --git a/tests/extensions/relational/basic.svtest b/tests/extensions/relational/basic.svtest
index bde077da6..4bb3fee9d 100644
--- a/tests/extensions/relational/basic.svtest
+++ b/tests/extensions/relational/basic.svtest
@@ -8,10 +8,10 @@ require "comparator-i;ascii-numeric";
*/
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
-Cc: frop@rename-it.nl
-CC: timo@rename-it.nl
+From: stephan@example.org
+To: nico@frop.example.org
+Cc: frop@example.org
+CC: timo@example.org
X-Spam-Score: 300
X-Nonsense: 1000
X-Nonsense: 20
diff --git a/tests/extensions/spamvirustest/spamtest.svtest b/tests/extensions/spamvirustest/spamtest.svtest
index 161209964..c6f04980a 100644
--- a/tests/extensions/spamvirustest/spamtest.svtest
+++ b/tests/extensions/spamvirustest/spamtest.svtest
@@ -10,7 +10,7 @@ require "variables";
test_set "message" text:
From: legitimate@example.com
-To: victim@dovecot.org
+To: victim@dovecot.example.net
Subject: Not spammish
X-SpamCheck: No, score=-1.6 required=5.0 autolearn=no version=3.2.5
X-SpamCheck1: No, score=0.0 required=5.0 autolearn=no version=3.2.5
@@ -134,7 +134,7 @@ test "Value: past-max" {
test_set "message" text:
From: legitimate@example.com
-To: victim@dovecot.org
+To: victim@dovecot.example.net
Subject: Not spammish
X-Spam-Status:
X-Spam-Status1: s
@@ -233,7 +233,7 @@ test "Strlen: past-max" {
test_set "message" text:
From: legitimate@example.com
-To: victim@dovecot.org
+To: victim@dovecot.example.net
Subject: Not spammish
X-Spam-Verdict: Not Spam
X-Spam-Verdict1: Spam
diff --git a/tests/extensions/spamvirustest/spamtestplus.svtest b/tests/extensions/spamvirustest/spamtestplus.svtest
index 4df9964c0..8459e56fc 100644
--- a/tests/extensions/spamvirustest/spamtestplus.svtest
+++ b/tests/extensions/spamvirustest/spamtestplus.svtest
@@ -10,7 +10,7 @@ require "variables";
test_set "message" text:
From: legitimate@example.com
-To: victim@dovecot.org
+To: victim@dovecot.example.net
Subject: Not spammish
X-SpamCheck: .00
X-SpamCheck1: .01
diff --git a/tests/extensions/spamvirustest/virustest.svtest b/tests/extensions/spamvirustest/virustest.svtest
index 3062ff846..6be852808 100644
--- a/tests/extensions/spamvirustest/virustest.svtest
+++ b/tests/extensions/spamvirustest/virustest.svtest
@@ -10,7 +10,7 @@ require "variables";
test_set "message" text:
From: legitimate@example.com
-To: victim@dovecot.org
+To: victim@dovecot.example.net
Subject: Viral
X-VirusCheck: Definitely
X-VirusCheck1: Almost Certain
diff --git a/tests/extensions/subaddress/basic.svtest b/tests/extensions/subaddress/basic.svtest
index 679fda7a0..6311a5af8 100644
--- a/tests/extensions/subaddress/basic.svtest
+++ b/tests/extensions/subaddress/basic.svtest
@@ -3,7 +3,7 @@ require "envelope";
require "subaddress";
test_set "message" text:
-From: stephan+sieve@renane-it.nl
+From: stephan+sieve@example.org
To: test+failed@example.com
Subject: subaddress test
@@ -11,8 +11,8 @@ Test!
.
;
-test_set "envelope.to" "friep+frop@dovecot.org";
-test_set "envelope.from" "list+request@lists.dovecot.org";
+test_set "envelope.to" "friep+frop@dovecot.example.net";
+test_set "envelope.from" "list+request@lists.dovecot.example.net";
test "Address from :user" {
if not address :is :user "from" "stephan" {
@@ -98,7 +98,7 @@ test "Undisclosed-recipients" {
}
}
-test_set "envelope.to" "frop@sieve.nl";
+test_set "envelope.to" "frop@sieve.example.net";
test "No detail" {
if envelope :detail "to" "virus" {
diff --git a/tests/extensions/subaddress/config.svtest b/tests/extensions/subaddress/config.svtest
index aa5c647af..7145a079b 100644
--- a/tests/extensions/subaddress/config.svtest
+++ b/tests/extensions/subaddress/config.svtest
@@ -3,7 +3,7 @@ require "subaddress";
require "envelope";
test_set "message" text:
-From: stephan+sieve@renane-it.nl
+From: stephan+sieve@example.org
To: test-failed@example.com
Subject: subaddress test
@@ -11,8 +11,8 @@ Test!
.
;
-test_set "envelope.to" "friep++frop@dovecot.org";
-test_set "envelope.from" "list--request@lists.dovecot.org";
+test_set "envelope.to" "friep++frop@dovecot.example.net";
+test_set "envelope.from" "list--request@lists.dovecot.example.net";
test "Delimiter default" {
if not address :is :user "from" "stephan" {
diff --git a/tests/extensions/subaddress/rfc.svtest b/tests/extensions/subaddress/rfc.svtest
index 58d326110..3651ffdf0 100644
--- a/tests/extensions/subaddress/rfc.svtest
+++ b/tests/extensions/subaddress/rfc.svtest
@@ -3,8 +3,8 @@ require "vnd.dovecot.testsuite";
require "subaddress";
test_set "message" text:
-From: stephan+@rename-it.nl
-To: timo+spam@iki.fi
+From: stephan+@example.org
+To: timo+spam@example.net
CC: nico@example.com
Subject: fetch my spam
diff --git a/tests/extensions/vacation/execute/action.sieve b/tests/extensions/vacation/execute/action.sieve
index 7bb089300..6dcf3753c 100644
--- a/tests/extensions/vacation/execute/action.sieve
+++ b/tests/extensions/vacation/execute/action.sieve
@@ -1,4 +1,4 @@
require "vacation";
-vacation :addresses "stephan@rename-it.nl" "I am not at home today";
+vacation :addresses "stephan@example.org" "I am not at home today";
keep;
diff --git a/tests/extensions/vacation/execute/no-handle.sieve b/tests/extensions/vacation/execute/no-handle.sieve
index b86298601..75ecd2e21 100644
--- a/tests/extensions/vacation/execute/no-handle.sieve
+++ b/tests/extensions/vacation/execute/no-handle.sieve
@@ -3,5 +3,5 @@ require "variables";
set "reason" "I have a conference in Seattle";
-vacation :subject "I am not in: ${reason}" :from "stephan@rename-it.nl" "I am gone for today: ${reason}.";
+vacation :subject "I am not in: ${reason}" :from "stephan@example.org" "I am gone for today: ${reason}.";
diff --git a/tests/extensions/vacation/message.svtest b/tests/extensions/vacation/message.svtest
index 75f7002eb..eecd91926 100644
--- a/tests/extensions/vacation/message.svtest
+++ b/tests/extensions/vacation/message.svtest
@@ -2,12 +2,12 @@ require "vnd.dovecot.testsuite";
require "vacation";
test_set "message" text:
-From: stephan@rename-it.nl
+From: stephan@example.org
Subject: frop
References: <1234@local.machine.example> <3456@example.net>
- <435444@ttms.com> <4223@froop.nl> <m345444444@message-id.exp>
-Message-ID: <432df324@rename-it.nl>
-To: nico@vestingbar.nl
+ <435444@ttms.example.org> <4223@froop.example.net> <m345444444@message-id.exp>
+Message-ID: <432df324@example.org>
+To: nico@frop.example.org
Frop
.
@@ -22,15 +22,15 @@ test "References" {
test_message :smtp 0;
- if not header :contains "references" "432df324@rename-it.nl" {
+ if not header :contains "references" "432df324@example.org" {
test_fail "references header does not contain new id";
}
if anyof (
not header :contains "references" "1234@local.machine.example",
not header :contains "references" "3456@example.net",
- not header :contains "references" "435444@ttms.com",
- not header :contains "references" "4223@froop.nl",
+ not header :contains "references" "435444@ttms.example.org",
+ not header :contains "references" "4223@froop.example.net",
not header :contains "references" "m345444444@message-id.exp"
) {
test_fail "references header does not contain all existing ids";
@@ -42,7 +42,7 @@ test "References" {
}
test "In-Reply-To" {
- if not header :is "in-reply-to" "<432df324@rename-it.nl>" {
+ if not header :is "in-reply-to" "<432df324@example.org>" {
test_fail "in-reply-to header set incorrectly";
}
}
diff --git a/tests/extensions/vacation/smtp.svtest b/tests/extensions/vacation/smtp.svtest
index 7e1fc037d..a1e7ac54c 100644
--- a/tests/extensions/vacation/smtp.svtest
+++ b/tests/extensions/vacation/smtp.svtest
@@ -3,19 +3,19 @@ require "envelope";
require "vacation";
test_set "message" text:
-From: stephan@rename-it.nl
-To: tss@iki.fi
+From: stephan@example.org
+To: tss@example.net
Subject: Frop!
Frop!
.
;
-test_set "envelope.from" "sirius@rename-it.nl";
-test_set "envelope.to" "timo@iki.fi";
+test_set "envelope.from" "sirius@example.org";
+test_set "envelope.to" "timo@example.net";
test "Basic" {
- vacation :addresses "tss@iki.fi" :from "Timo Sirainen <sirainen@iki.fi>" "I am gone";
+ vacation :addresses "tss@example.net" :from "Timo Sirainen <sirainen@example.net>" "I am gone";
if not test_result_execute {
test_fail "failed to execute vacation";
@@ -23,15 +23,15 @@ test "Basic" {
test_message :smtp 0;
- if not address :is "to" "sirius@rename-it.nl" {
+ if not address :is "to" "sirius@example.org" {
test_fail "to address incorrect";
}
- if not address :is "from" "sirainen@iki.fi" {
+ if not address :is "from" "sirainen@example.net" {
test_fail "from address incorrect";
}
- if not envelope :is "to" "sirius@rename-it.nl" {
+ if not envelope :is "to" "sirius@example.org" {
test_fail "envelope recipient incorrect";
}
@@ -44,7 +44,7 @@ test_result_reset;
test_set "envelope.from" "<>";
test "Null Sender" {
- vacation :addresses "tss@iki.fi" "I am gone";
+ vacation :addresses "tss@example.net" "I am gone";
if not test_result_execute {
test_fail "failed to execute vacation";
@@ -58,17 +58,17 @@ test "Null Sender" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: timo@iki.fi
-Cc: stephan@drunksnipers.com
+From: stephan@example.org
+To: timo@example.net
+Cc: stephan@friep.example.com
Subject: Frop!
Frop!
.
;
-test_set "envelope.from" "sirius@rename-it.nl";
-test_set "envelope.to" "timo@iki.fi";
+test_set "envelope.from" "sirius@example.org";
+test_set "envelope.to" "timo@example.net";
test "Envelope.to == To" {
vacation "I am gone";
@@ -79,7 +79,7 @@ test "Envelope.to == To" {
test_message :smtp 0;
- if not address :is "from" "timo@iki.fi" {
+ if not address :is "from" "timo@example.net" {
test_fail "from address incorrect";
}
@@ -91,20 +91,20 @@ test "Envelope.to == To" {
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
-To: tss@iki.fi
-Cc: stephan@drunksnipers.com
+From: stephan@example.org
+To: tss@example.net
+Cc: stephan@friep.example.com
Subject: Frop!
Frop!
.
;
-test_set "envelope.from" "sirius@rename-it.nl";
-test_set "envelope.to" "timo@iki.fi";
+test_set "envelope.from" "sirius@example.org";
+test_set "envelope.to" "timo@example.net";
test "Envelope.to != To" {
- vacation :addresses "tss@iki.fi" "I am gone";
+ vacation :addresses "tss@example.net" "I am gone";
if not test_result_execute {
test_fail "failed to execute vacation";
@@ -112,7 +112,7 @@ test "Envelope.to != To" {
test_message :smtp 0;
- if not address :is "from" "tss@iki.fi" {
+ if not address :is "from" "tss@example.net" {
test_fail "from address incorrect";
}
diff --git a/tests/extensions/vacation/utf-8.svtest b/tests/extensions/vacation/utf-8.svtest
index f378a9f0c..2417a67b3 100644
--- a/tests/extensions/vacation/utf-8.svtest
+++ b/tests/extensions/vacation/utf-8.svtest
@@ -3,12 +3,12 @@ require "vacation";
require "variables";
test_set "message" text:
-From: stephan@rename-it.nl
+From: stephan@example.org
Subject: frop
References: <1234@local.machine.example> <3456@example.net>
- <435444@ttms.com> <4223@froop.nl> <m345444444@message-id.exp>
-Message-ID: <432df324@rename-it.nl>
-To: nico@vestingbar.nl
+ <435444@ttms.com> <4223@froop.example.net> <m345444444@message-id.exp>
+Message-ID: <432df324@example.org>
+To: nico@frop.example.org
Frop
.
@@ -45,12 +45,12 @@ decoded: ${subject}
test_result_reset;
test_set "message" text:
-From: stephan@rename-it.nl
+From: stephan@example.org
Subject: frop
References: <1234@local.machine.example> <3456@example.net>
- <435444@ttms.com> <4223@froop.nl> <m345444444@message-id.exp>
-Message-ID: <432df324@rename-it.nl>
-To: nico@vestingbar.nl
+ <435444@ttms.com> <4223@froop.example.net> <m345444444@message-id.exp>
+Message-ID: <432df324@example.org>
+To: nico@frop.example.org
Frop
.
diff --git a/tests/extensions/variables/basic.svtest b/tests/extensions/variables/basic.svtest
index 3e9baded9..2817357d5 100644
--- a/tests/extensions/variables/basic.svtest
+++ b/tests/extensions/variables/basic.svtest
@@ -2,7 +2,7 @@ require "vnd.dovecot.testsuite";
require "variables";
test_set "message" text:
-From: stephan@rename-it.nl
+From: stephan@example.org
To: test@example.com
Subject: Variables test
@@ -174,20 +174,20 @@ I'm out, please leave a message after the meep.
test "Multi-line string substitution" {
set "name" "Stephan Bosch";
- set "address" "stephan@rename-it.nl";
+ set "address" "stephan@example.org";
set "subject" "Test message";
set "message" text: # Message with substitutions
From: ${name} <${address}>
-To: Bertus van Asseldonk <b.vanasseldonk@hetkennet.nl>
+To: Bertus van Asseldonk <b.vanasseldonk@nl.example.com>
Subject: ${subject}
This is a test message.
.
;
if not string :is "${message}" text:
-From: Stephan Bosch <stephan@rename-it.nl>
-To: Bertus van Asseldonk <b.vanasseldonk@hetkennet.nl>
+From: Stephan Bosch <stephan@example.org>
+To: Bertus van Asseldonk <b.vanasseldonk@nl.example.com>
Subject: Test message
This is a test message.
diff --git a/tests/extensions/variables/match.svtest b/tests/extensions/variables/match.svtest
index c7a534179..fcbb1e982 100644
--- a/tests/extensions/variables/match.svtest
+++ b/tests/extensions/variables/match.svtest
@@ -102,9 +102,9 @@ test "RFC - values overwrite" {
test "RFC - example" {
test_set "message" text:
Subject: [acme-users] [fwd] version 1.0 is out
-List-Id: Dovecot Mailing List <dovecot@dovecot.org>
+List-Id: Dovecot Mailing List <dovecot@dovecot.example.net>
To: coyote@ACME.Example.COM
-Fom: stephan@rename-it.nl
+Fom: stephan@example.org
Test message.
.
@@ -337,17 +337,17 @@ test "Letters words *? first" {
*/
test_set "message" text:
-Return-path: <stephan@xi.rename-it.nl>
-Envelope-to: stephan@xi.rename-it.nl
+Return-path: <stephan@xi.example.org>
+Envelope-to: stephan@xi.example.org
Delivery-date: Sun, 01 Feb 2009 11:29:57 +0100
-Received: from stephan by xi.rename-it.nl with local (Exim 4.69)
- (envelope-from <stephan@xi.rename-it.nl>)
+Received: from stephan by xi.example.org with local (Exim 4.69)
+ (envelope-from <stephan@xi.example.org>)
id 1LTZaP-0007h3-2e
- for stephan@xi.rename-it.nl; Sun, 01 Feb 2009 11:29:57 +0100
-From: Dovecot Debian Builder <stephan.rename-it.nl@xi.rename-it.nl>
-To: stephan@xi.rename-it.nl
+ for stephan@xi.example.org; Sun, 01 Feb 2009 11:29:57 +0100
+From: Dovecot Debian Builder <stephan.example.org@xi.example.org>
+To: stephan@xi.example.org
Subject: Log for failed build of dovecot_2:1.2.alpha5-0~auto+159 (dist=hardy)
-Message-Id: <E1LTZaP-0007h3-2e@xi.rename-it.nl>
+Message-Id: <E1LTZaP-0007h3-2e@xi.example.org>
Date: Sun, 01 Feb 2009 11:29:57 +0100
Automatic build of dovecot_1.2.alpha5-0~auto+159 on xi by sbuild/i386 0.57.7
diff --git a/tests/header.svtest b/tests/header.svtest
index a8cee307e..9d45286cd 100644
--- a/tests/header.svtest
+++ b/tests/header.svtest
@@ -1,8 +1,8 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan@example.org
+To: nico@frop.example.com
Subject: Help
X-A: Text
X-B: Text
diff --git a/tests/match-types/contains.svtest b/tests/match-types/contains.svtest
index de0ff3187..f6bddce51 100644
--- a/tests/match-types/contains.svtest
+++ b/tests/match-types/contains.svtest
@@ -1,9 +1,9 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan@rename-it.nl
+From: stephan@example.org
Cc: frop@example.com
-To: test@dovecot.org
+To: test@dovecot.example.net
X-Bullshit: f fr fro frop frob frobn frobnitzn
Subject: Test Message
Comment:
@@ -25,7 +25,7 @@ test "Match empty" {
}
test "Match full" {
- if not address :contains "from" "stephan@rename-it.nl" {
+ if not address :contains "from" "stephan@example.org" {
test_fail "should have matched";
}
}
@@ -37,7 +37,7 @@ test "Match begin" {
}
test "Match end" {
- if not address :contains "from" "rename-it.nl" {
+ if not address :contains "from" "example.org" {
test_fail "should have matched";
}
}
@@ -55,13 +55,13 @@ test "Match similar beginnings" {
}
test "Match case-insensitive" {
- if not address :contains :comparator "i;ascii-casemap" "from" "RENAME-IT" {
+ if not address :contains :comparator "i;ascii-casemap" "from" "EXAMPLE" {
test_fail "match fails to apply correct comparator";
}
- if not address :contains "from" "RENAME-IT" {
- test_fail "default comparator is wrong";
- }
+ if not address :contains "from" "EXAMPLE" {
+ test_fail "default comparator is wrong";
+ }
}
# Non-match tests
diff --git a/tests/match-types/is.svtest b/tests/match-types/is.svtest
index 01ef356aa..2fa02a092 100644
--- a/tests/match-types/is.svtest
+++ b/tests/match-types/is.svtest
@@ -1,8 +1,8 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: Stephan Bosch <stephan@rename-it.nl>
-To: nico@vestingbar.nl
+From: Stephan Bosch <stephan@example.org>
+To: nico@frop.example.org
Subject: Test message
Comment:
diff --git a/tests/match-types/matches.svtest b/tests/match-types/matches.svtest
index 47521c6e9..f81a484aa 100644
--- a/tests/match-types/matches.svtest
+++ b/tests/match-types/matches.svtest
@@ -1,11 +1,11 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan+sieve@drunksnipers.com
-To: sirius@rename-it.nl
-To: nico@vestingbar.nl
+From: stephan+sieve@friep.example.com
+To: sirius@example.org
+To: nico@frop.example.org
Cc: me@example.com
-Cc: timo@dovecot.com
+Cc: timo@dovecot.example.com
X-Hufter: TRUE
Subject: make your money very fast!!!
X-Spam-Score: **********
@@ -22,7 +22,6 @@ Het werkt!
* General conformance testing
*/
-/*
test "Empty string" {
if not header :matches "comment" "" {
test_fail "failed to match \"\" against \"\"";
@@ -38,71 +37,71 @@ test "Empty string" {
}
test "Multiple '*'" {
- if not address :matches "from" "*@d*ksn*ers.com" {
+ if not address :matches "from" "*@fri*p*examp*.com" {
test_fail "should have matched";
}
- if address :matches "from" "*@d*kn*ers.com" {
+ if address :matches "from" "*@f*pex*mple.com" {
test_fail "should not have matched";
}
}
test "End '*'" {
- if not address :matches "from" "stephan+sieve@drunksnipers.*" {
+ if not address :matches "from" "stephan+sieve@friep.*" {
test_fail "should have matched";
}
- if address :matches "from" "stepan+sieve@drunksnipers.*" {
+ if address :matches "from" "stepan+sieve@friep.*" {
test_fail "should not have matched";
}
}
test "Begin '*'" {
- if not address :matches "from" "*+sieve@drunksnipers.com" {
+ if not address :matches "from" "*+sieve@friep.example.com" {
test_fail "should have matched";
}
- if address :matches "from" "*+sieve@drunksnipers.om" {
+ if address :matches "from" "*+sieve@friep.example.om" {
test_fail "should not have matched";
}
}
test "Middle '?'" {
- if not address :matches "from" "stephan+sieve?drunksnipers.com" {
+ if not address :matches "from" "stephan+sieve?friep.example.com" {
test_fail "should have matched";
}
- if address :matches "from" "stephan+sieve?drunksipers.com" {
+ if address :matches "from" "stephan+sieve?fiep.example.com" {
test_fail "should not have matched";
}
}
test "Begin '?'" {
- if not address :matches "from" "?tephan+sieve@drunksnipers.com" {
+ if not address :matches "from" "?tephan+sieve@friep.example.com" {
test_fail "should have matched";
}
- if address :matches "from" "?tephan+sievedrunksnipers.com" {
+ if address :matches "from" "?tephan+sievefriep.example.com" {
test_fail "should not have matched";
}
}
test "End '?'" {
- if not address :matches "from" "stephan+sieve@drunksnipers.co?" {
+ if not address :matches "from" "stephan+sieve@friep.example.co?" {
test_fail "should have matched";
}
- if address :matches "from" "sephan+sieve@drunksnipers.co?" {
+ if address :matches "from" "sephan+sieve@friep.example.co?" {
test_fail "should not have matched";
}
}
test "Multiple '?'" {
- if not address :matches "from" "?t?phan?sieve?drunksnip?rs.co?" {
+ if not address :matches "from" "?t?phan?sieve?fri?p.exampl?.co?" {
test_fail "should have matched";
}
- if address :matches "from" "?t?phan?sieve?dunksnip?rs.co?" {
+ if address :matches "from" "?t?phan?sieve?fiep.exam?le.co?" {
test_fail "should not have matched";
}
}
@@ -195,7 +194,7 @@ test "Put '*' directly before '?'" {
if not header :matches "x-subject" "Log for *? build of *" {
test_fail "should have matched";
}
-}*/
+}
test "Put '?' directly before '*'" {
if header :matches "x-subject" "Log for ???????????* build of *" {
diff --git a/tests/multiscript/basic.svtest b/tests/multiscript/basic.svtest
index 54fb26b1c..0b59ff449 100644
--- a/tests/multiscript/basic.svtest
+++ b/tests/multiscript/basic.svtest
@@ -1,9 +1,9 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan@rename-it.nl
-Message-ID: <frop33333333333333333@frutsens.nl>
-To: nico@vestingbar.nl
+From: stephan@example.org
+Message-ID: <frop33333333333333333@frutsens.example.nl>
+To: nico@frop.example.org
Subject: Frop.
Friep.
diff --git a/tests/multiscript/conflicts.svtest b/tests/multiscript/conflicts.svtest
index 7af89f4a8..c50192777 100644
--- a/tests/multiscript/conflicts.svtest
+++ b/tests/multiscript/conflicts.svtest
@@ -1,9 +1,9 @@
require "vnd.dovecot.testsuite";
test_set "message" text:
-From: stephan@rename-it.nl
-Message-ID: <frop33333333333333333@frutsens.nl>
-To: nico@vestingbar.nl
+From: stephan@example.org
+Message-ID: <frop33333333333333333@nl.example.com>
+To: nico@frop.example.org
Subject: Frop.
Friep.
diff --git a/tests/multiscript/notify.sieve b/tests/multiscript/notify.sieve
index 9e5507bc7..af47ad977 100644
--- a/tests/multiscript/notify.sieve
+++ b/tests/multiscript/notify.sieve
@@ -1,3 +1,3 @@
require "enotify";
-notify "mailto:stephan@rename-it.nl";
+notify "mailto:stephan@example.org";
diff --git a/tests/testsuite.svtest b/tests/testsuite.svtest
index 724a7161b..686331701 100644
--- a/tests/testsuite.svtest
+++ b/tests/testsuite.svtest
@@ -5,28 +5,28 @@ require "envelope";
test "Message Environment" {
test_set "message" text:
-From: sirius@rename-it.nl
-To: nico@vestingbar.nl
+From: sirius@example.org
+To: nico@frop.example.com
Subject: Frop!
Frop!
.
;
- if not header :contains "from" "rename-it.nl" {
+ if not header :contains "from" "example.org" {
test_fail "message data not set properly.";
}
test_set "message" text:
-From: nico@vestingbar.nl
-To: stephan@zuiphol.nl
+From: nico@frop.example.com
+To: stephan@nl.example.com
Subject: Friep!
Friep!
.
;
- if not header :is "from" "nico@vestingbar.nl" {
+ if not header :is "from" "nico@frop.example.com" {
test_fail "message data not set properly.";
}
@@ -36,15 +36,15 @@ Friep!
/* Test envelope environment */
test "Envelope Environment" {
- test_set "envelope.from" "stephan@hutsefluts.nl";
+ test_set "envelope.from" "stephan@hutsefluts.example.net";
- if not envelope :is "from" "stephan@hutsefluts.nl" {
+ if not envelope :is "from" "stephan@hutsefluts.example.net" {
test_fail "envelope.from data not set properly (1).";
}
- test_set "envelope.to" "news@rename-it.nl";
+ test_set "envelope.to" "news@example.org";
- if not envelope :is "to" "news@rename-it.nl" {
+ if not envelope :is "to" "news@example.org" {
test_fail "envelope.to data not set properly (1).";
}
@@ -54,15 +54,15 @@ test "Envelope Environment" {
test_fail "envelope.auth data not set properly (1).";
}
- test_set "envelope.from" "stephan@rename-it.nl";
+ test_set "envelope.from" "stephan@example.org";
- if not envelope :is "from" "stephan@rename-it.nl" {
+ if not envelope :is "from" "stephan@example.org" {
test_fail "envelope.from data not reset properly (2).";
}
- test_set "envelope.to" "past-news@rename-it.nl";
+ test_set "envelope.to" "past-news@example.org";
- if not envelope :is "to" "past-news@rename-it.nl" {
+ if not envelope :is "to" "past-news@example.org" {
test_fail "envelope.to data not reset properly (2).";
}
--
GitLab