[Pkg-owncloud-commits] [owncloud-client] 35/219: Tests: Get rid of the Carp package that ogoffart does not have.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit f1fb36bcb8b05fdd8f6d6c4454b88049c8e4102e
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Aug 28 18:06:47 2014 +0200

    Tests: Get rid of the Carp package that ogoffart does not have.
    
    Recommendation: Use a decent distribution! But anyway....
---
 csync/tests/ownCloud/ownCloud/Test.pm | 12 ++++++++++--
 csync/tests/ownCloud/t1.pl            |  1 -
 csync/tests/ownCloud/t2.pl            |  2 +-
 csync/tests/ownCloud/t3.pl            |  2 +-
 csync/tests/ownCloud/t4.pl            |  2 +-
 csync/tests/ownCloud/t5.pl            |  2 +-
 csync/tests/ownCloud/t6.pl            |  2 +-
 csync/tests/ownCloud/t7.pl            |  2 +-
 csync/tests/ownCloud/t8.pl            |  2 +-
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/csync/tests/ownCloud/ownCloud/Test.pm b/csync/tests/ownCloud/ownCloud/Test.pm
index 931f3f2..74e20be 100644
--- a/csync/tests/ownCloud/ownCloud/Test.pm
+++ b/csync/tests/ownCloud/ownCloud/Test.pm
@@ -27,7 +27,6 @@ use Exporter;
 use HTTP::DAV 0.47;
 use Data::Dumper;
 use File::Glob ':glob';
-use Carp::Assert;
 use Digest::MD5;
 use Unicode::Normalize;
 use LWP::UserAgent;
@@ -36,6 +35,7 @@ use HTTP::Request::Common qw( POST GET DELETE );
 use File::Basename;
 use IO::Handle;
 use POSIX qw/strftime/;
+use Carp;
 
 use Encode qw(from_to);
 use utf8;
@@ -66,7 +66,7 @@ our %config;
                   assertLocalDirs assertLocalAndRemoteDir glob_put put_to_dir 
                   putToDirLWP localDir remoteDir localCleanup createLocalFile md5OfFile
                   remoteCleanup server initLocalDir initRemoteDir moveRemoteFile
-                  printInfo remoteFileId createShare removeShare
+                  printInfo remoteFileId createShare removeShare assert
                   configValue testDirUrl getToFileLWP getToFileCurl);
 
 sub server
@@ -783,4 +783,12 @@ sub removeShare($$)
     my $response = $ua->request($req);
 }
 
+sub assert($;$)
+{
+    unless( $_[0] ) {
+      print Carp::confess(@_);
+      exit(1);
+    }
+}
+
 #
diff --git a/csync/tests/ownCloud/t1.pl b/csync/tests/ownCloud/t1.pl
index 79dac8e..68e5541 100755
--- a/csync/tests/ownCloud/t1.pl
+++ b/csync/tests/ownCloud/t1.pl
@@ -23,7 +23,6 @@
 
 use lib ".";
 
-use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;
 
diff --git a/csync/tests/ownCloud/t2.pl b/csync/tests/ownCloud/t2.pl
index 9b372b6..6358bf0 100755
--- a/csync/tests/ownCloud/t2.pl
+++ b/csync/tests/ownCloud/t2.pl
@@ -23,7 +23,7 @@
 
 use lib ".";
 
-use Carp::Assert;
+
 use File::Copy;
 use ownCloud::Test;
 
diff --git a/csync/tests/ownCloud/t3.pl b/csync/tests/ownCloud/t3.pl
index 4f11159..087fb99 100755
--- a/csync/tests/ownCloud/t3.pl
+++ b/csync/tests/ownCloud/t3.pl
@@ -23,7 +23,7 @@
 
 use lib ".";
 
-use Carp::Assert;
+
 use File::Copy;
 use ownCloud::Test;
 
diff --git a/csync/tests/ownCloud/t4.pl b/csync/tests/ownCloud/t4.pl
index 5c8a115..f35c0e9 100755
--- a/csync/tests/ownCloud/t4.pl
+++ b/csync/tests/ownCloud/t4.pl
@@ -23,7 +23,7 @@
 
 use lib ".";
 
-use Carp::Assert;
+
 use File::Copy;
 use ownCloud::Test;
 
diff --git a/csync/tests/ownCloud/t5.pl b/csync/tests/ownCloud/t5.pl
index dbc6015..32544cb 100755
--- a/csync/tests/ownCloud/t5.pl
+++ b/csync/tests/ownCloud/t5.pl
@@ -23,7 +23,7 @@
 
 use lib ".";
 
-use Carp::Assert;
+
 use File::Copy;
 use ownCloud::Test;
 
diff --git a/csync/tests/ownCloud/t6.pl b/csync/tests/ownCloud/t6.pl
index 66019fe..3d43ff3 100755
--- a/csync/tests/ownCloud/t6.pl
+++ b/csync/tests/ownCloud/t6.pl
@@ -23,7 +23,7 @@
 
 use lib ".";
 
-use Carp::Assert;
+
 use File::Copy;
 use ownCloud::Test;
 
diff --git a/csync/tests/ownCloud/t7.pl b/csync/tests/ownCloud/t7.pl
index 3bee934..8a2eb20 100755
--- a/csync/tests/ownCloud/t7.pl
+++ b/csync/tests/ownCloud/t7.pl
@@ -23,7 +23,7 @@
 
 use lib ".";
 
-use Carp::Assert;
+
 use File::Copy;
 use ownCloud::Test;
 
diff --git a/csync/tests/ownCloud/t8.pl b/csync/tests/ownCloud/t8.pl
index e8825bc..883a959 100755
--- a/csync/tests/ownCloud/t8.pl
+++ b/csync/tests/ownCloud/t8.pl
@@ -23,7 +23,7 @@
 
 use lib ".";
 
-use Carp::Assert;
+
 use File::Copy;
 use ownCloud::Test;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git