Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
	httemplate/misc/process/cancel_pkg.html

1 files changed, 2 insertions, 5 deletions

diff --git a/rt/t/api/attribute-tests.t b/rt/t/api/attribute-tests.t
index 90c3ddb7e..8489f1a56 100644
--- a/rt/t/api/attribute-tests.t
+++ b/rt/t/api/attribute-tests.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use RT;
-use RT::Test tests => 34;
+use RT::Test nodata => 1, tests => 34;
 
 
 
@@ -11,7 +11,7 @@ my $attribute = "squelch-$runid";
 
 ok(require RT::Attributes);
 
-my $user = RT::User->new($RT::SystemUser);
+my $user = RT::User->new(RT->SystemUser);
 ok (UNIVERSAL::isa($user, 'RT::User'));
 my ($id,$msg)  = $user->Create(Name => 'attrtest-'.$runid);
 ok ($id, $msg);
@@ -81,6 +81,3 @@ ok(1, $attr->BuildSelectQuery);
 @names = $attr->Names;
 is("@names", "TestAttr");
 
-
-
-1;