From: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Date: Sat, 1 Sep 2012 13:39:19 +0000 (+0100)
Subject: Revert "Fix t/storage/reconnect.t when run as root"
X-Git-Tag: v0.08201~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a96c80eb706d3ccadf3b29d3f5a71a0e66b72170;p=dbsrgits%2FDBIx-Class.git

Revert "Fix t/storage/reconnect.t when run as root"

The test change just papered over the problem, a proper fix is pending
on the for_current/riba/fix_sqlite_ping_RT78420 branch.

This reverts commit 64819b0e69a844bb790701e13931afcc34f3d981.
---

diff --git a/Changes b/Changes
index 560b8ca..2fef676 100644
--- a/Changes
+++ b/Changes
@@ -1,8 +1,5 @@
 Revision history for DBIx::Class
 
-    * Fixes
-        - Fix t/storage/reconnect.t when run as root
-
 0.08200 2012-08-24 (UTC)
     * Fixes
         - Change one of the new tests for the previous release to not require
diff --git a/t/storage/reconnect.t b/t/storage/reconnect.t
index 17bd75f..b28734b 100644
--- a/t/storage/reconnect.t
+++ b/t/storage/reconnect.t
@@ -54,9 +54,8 @@ chmod 0000, $db_orig;
     } 'The operation failed';
 }
 
-# otherwise win32 can't unlink the fake db file
-# as root sqlite will have the file open and won't reconnect
-$schema->storage->_dbh->disconnect if $^O eq 'MSWin32' or $> == 0;
+# otherwise can't unlink the fake db file
+$schema->storage->_dbh->disconnect if $^O eq 'MSWin32';
 
 ### Now, move the db file back to the correct name
 unlink($db_orig) or die "could not delete $db_orig: $!";