protect several tests from the local environment

mojolicious · Apr 1, 2014 · b6b59c0 · b6b59c0
1 parent b152c4d
commit b6b59c0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/t/mojo/daemon.t b/t/mojo/daemon.t
@@ -16,18 +16,20 @@ use Mojolicious;
 
 # Timeout
 {
+  local $ENV{MOJO_INACTIVITY_TIMEOUT};
   is(Mojo::Server::Daemon->new->inactivity_timeout, 15, 'right value');
-  local $ENV{MOJO_INACTIVITY_TIMEOUT} = 25;
+  $ENV{MOJO_INACTIVITY_TIMEOUT} = 25;
   is(Mojo::Server::Daemon->new->inactivity_timeout, 25, 'right value');
   $ENV{MOJO_INACTIVITY_TIMEOUT} = 0;
   is(Mojo::Server::Daemon->new->inactivity_timeout, 0, 'right value');
 }
 
 # Listen
 {
+  local $ENV{MOJO_LISTEN};
   is_deeply(Mojo::Server::Daemon->new->listen,
     ['http://*:3000'], 'right value');
-  local $ENV{MOJO_LISTEN} = 'http://localhost:8080';
+  $ENV{MOJO_LISTEN} = 'http://localhost:8080';
   is_deeply(Mojo::Server::Daemon->new->listen,
     ['http://localhost:8080'], 'right value');
   $ENV{MOJO_LISTEN} = 'http://*:80,https://*:443';

diff --git a/t/mojo/home.t b/t/mojo/home.t
@@ -10,6 +10,8 @@ use List::Util 'first';
 use Mojo::HelloWorld;
 use Mojo::Home;
 
+local $ENV{MOJO_HOME};
+
 # ENV detection
 {
   local $ENV{MOJO_HOME} = '.';

diff --git a/t/mojo/user_agent.t b/t/mojo/user_agent.t
@@ -58,16 +58,19 @@ any '/method' => {inline => '<%= $self->req->method =%>'};
 
 # Timeouts
 {
+  local $ENV{MOJO_CONNECT_TIMEOUT};
   is(Mojo::UserAgent->new->connect_timeout, 10, 'right value');
-  local $ENV{MOJO_CONNECT_TIMEOUT} = 25;
+  $ENV{MOJO_CONNECT_TIMEOUT} = 25;
   is(Mojo::UserAgent->new->connect_timeout,    25, 'right value');
+  local $ENV{MOJO_INACTIVITY_TIMEOUT};
   is(Mojo::UserAgent->new->inactivity_timeout, 20, 'right value');
-  local $ENV{MOJO_INACTIVITY_TIMEOUT} = 25;
+  $ENV{MOJO_INACTIVITY_TIMEOUT} = 25;
   is(Mojo::UserAgent->new->inactivity_timeout, 25, 'right value');
   $ENV{MOJO_INACTIVITY_TIMEOUT} = 0;
   is(Mojo::UserAgent->new->inactivity_timeout, 0, 'right value');
+  local $ENV{MOJO_REQUEST_TIMEOUT};
   is(Mojo::UserAgent->new->request_timeout,    0, 'right value');
-  local $ENV{MOJO_REQUEST_TIMEOUT} = 25;
+  $ENV{MOJO_REQUEST_TIMEOUT} = 25;
   is(Mojo::UserAgent->new->request_timeout, 25, 'right value');
   $ENV{MOJO_REQUEST_TIMEOUT} = 0;
   is(Mojo::UserAgent->new->request_timeout, 0, 'right value');

diff --git a/t/mojo/util.t b/t/mojo/util.t
@@ -422,11 +422,12 @@ is tablify([['foo', 'bar', 'baz'], ['yada', 'yada', 'yada']]),
   my ($warn, $die) = @_;
   local $SIG{__WARN__} = sub { $warn = shift };
   local $SIG{__DIE__}  = sub { $die  = shift };
+  local $ENV{MOJO_FATAL_DEPRECATIONS};
   is Mojo::DeprecationTest::foo(), 'bar', 'right result';
   like $warn, qr/foo is DEPRECATED at .*util\.t line \d+/, 'right warning';
   ok !$die, 'no exception';
   ($warn, $die) = ();
-  local $ENV{MOJO_FATAL_DEPRECATIONS} = 1;
+  $ENV{MOJO_FATAL_DEPRECATIONS} = 1;
   ok !eval { Mojo::DeprecationTest::foo() }, 'no result';
   ok !$warn, 'no warning';
   like $die, qr/foo is DEPRECATED at .*util\.t line \d+/, 'right exception';

diff --git a/t/mojolicious/json_config_lite_app.t b/t/mojolicious/json_config_lite_app.t
@@ -60,9 +60,10 @@ is app->config('it'),  'works', 'right value';
 
 # No config file, no default
 {
+  local $ENV{MOJO_CONFIG};
   ok !(eval { plugin JSONConfig => {file => 'nonexistent'} }),
     'no config file';
-  local $ENV{MOJO_CONFIG} = 'nonexistent';
+  $ENV{MOJO_CONFIG} = 'nonexistent';
   ok !(eval { plugin 'JSONConfig' }), 'no config file';
 }