Testsuite: when running under the testharness, wait longer for transport process...

[users/jgh/exim.git] / test / t / 00-basic.t

diff --git a/test/t/00-basic.t b/test/t/00-basic.t
index 49d6f68718ee416cce714473df005c24fa55b360..2fbd2decd0499ecd0711b1250b1fd40d95f56def 100644 (file)
--- a/test/t/00-basic.t
+++ b/test/t/00-basic.t
@@ -40,10 +40,13 @@ subtest 'exim_binary' => sub {
 };
 
 subtest 'flavour' => sub {
-    is flavour('t/samples/etc.debian8-os-release'), 'debian8' => 'got flavour debian8 from os-release';
-    is flavour('t/samples/etc.debian8-debian-version'), 'debian8' => 'got flavour debian8 from debian_version';
-    is flavour('t/samples/etc.fedora24'), 'fedora24' => 'got flavour fedora24 from os-release';
-    is_deeply [flavours()], ['debian8'] => 'got available flavours';
+    is flavour('t/samples/debian8+os-release/etc'), 'debian8' => 'got flavour debian8 from os-release';
+    is flavour('t/samples/debian8+debian-version/etc'), 'debian8' => 'got flavour debian8 from debian_version';
+    is flavour('t/samples/debian.sid/etc'), 'debian' => 'got flavour debian from debian sid w/o VERSION_ID';
+    is flavour('t/samples/fedora24/etc'), 'fedora24' => 'got flavour fedora24 from os-release';
+    is flavour('t/samples/empty'), undef()           => 'got empty flavour (undef)';
+    # we do not have flavours anymore (2017-03-18)
+    # is_deeply [flavours()], ['debian8'] => 'got available flavours';
 };
 
 done_testing;