[Rt-commit] rt branch, 4.4/ldap-screendebug, created. rt-4.4.0rc1-2-g2f14fe9

[Shawn Moore]

The branch, 4.4/ldap-screendebug has been created
        at  2f14fe92a1dc59ef4d24b7fe2d590aa1f4e672b5 (commit)

- Log -----------------------------------------------------------------
commit 615120d3d89bc97fd9b3295ff869755bbc71b7e4
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Mon Nov 16 19:35:08 2015 +0000

    Fix failing test in ldapimport/user-import.t
    
        I'm seeing user 42 load testuser4 at invalid.tld, when it's supposed to be
        a higher-than-any-user ID

diff --git a/t/ldapimport/user-import.t b/t/ldapimport/user-import.t
index 4c19c36..1a92b46 100644
--- a/t/ldapimport/user-import.t
+++ b/t/ldapimport/user-import.t
@@ -32,11 +32,11 @@ for ( 1 .. 13 ) {
     $ldap->add( $dn, attr => [%$entry] );
 }
 $ldap->add(
-    "uid=42,ou=foo,dc=bestpractical,dc=com",
+    "uid=9000,ou=foo,dc=bestpractical,dc=com",
     attr => [
         cn   => "Numeric user",
         mail => "numeric\@invalid.tld",
-        uid  => 42,
+        uid  => 9000,
         objectclass => 'User',
     ],
 );
@@ -77,9 +77,9 @@ for my $entry (@ldap_entries) {
 my $user = RT::User->new($RT::SystemUser);
 $user->LoadByCols( EmailAddress => "numeric\@invalid.tld" );
 ok(!$user->Id);
-$user->LoadByCols( Name => 42 );
+$user->LoadByCols( Name => 9000 );
 ok(!$user->Id);
-$user->Load( 42 );
+$user->Load( 9000 );
 ok(!$user->Id);
 
 # can't unbind earlier or the server will die

commit 2f14fe92a1dc59ef4d24b7fe2d590aa1f4e672b5
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Mon Nov 16 19:38:11 2015 +0000

    Remove calls to removed ->screendebug

diff --git a/t/ldapimport/group-import.t b/t/ldapimport/group-import.t
index 25f8719..76db1bb 100644
--- a/t/ldapimport/group-import.t
+++ b/t/ldapimport/group-import.t
@@ -63,8 +63,6 @@ RT->Config->Set('LDAPBase','dc=bestpractical,dc=com');
 RT->Config->Set('LDAPFilter','(objectClass=User)');
 RT->Config->Set('LDAPSkipAutogeneratedGroup',1);
 
-$importer->screendebug(1) if ($ENV{TEST_VERBOSE});
-
 ok($importer->import_users( import => 1 ));
 for my $entry (@ldap_user_entries) {
     my $user = RT::User->new($RT::SystemUser);
diff --git a/t/ldapimport/group-member-import.t b/t/ldapimport/group-member-import.t
index a0a0266..4e0ce8f 100644
--- a/t/ldapimport/group-member-import.t
+++ b/t/ldapimport/group-member-import.t
@@ -71,8 +71,6 @@ RT->Config->Set('LDAPGroupMapping',
                    });
 RT->Config->Set('LDAPImportGroupMembers',1);
 
-$importer->screendebug(1) if ($ENV{TEST_VERBOSE});
-
 # confirm that we skip the import
 ok( $importer->import_groups() );
 {
diff --git a/t/ldapimport/user-import-cfs.t b/t/ldapimport/user-import-cfs.t
index f33ee05..6a157ab 100644
--- a/t/ldapimport/user-import-cfs.t
+++ b/t/ldapimport/user-import-cfs.t
@@ -57,8 +57,6 @@ RT->Config->Set('LDAPMapping',
 RT->Config->Set('LDAPBase','ou=foo,dc=bestpractical,dc=com');
 RT->Config->Set('LDAPFilter','(objectClass=User)');
 
-$importer->screendebug(1) if ($ENV{TEST_VERBOSE});
-
 # check that we don't import
 ok($importer->import_users());
 {
diff --git a/t/ldapimport/user-import-privileged.t b/t/ldapimport/user-import-privileged.t
index dca751a..44aeff3 100644
--- a/t/ldapimport/user-import-privileged.t
+++ b/t/ldapimport/user-import-privileged.t
@@ -42,8 +42,6 @@ RT->Config->Set('LDAPBase','ou=foo,dc=bestpractical,dc=com');
 RT->Config->Set('LDAPFilter','(objectClass=User)');
 RT->Config->Set('LDAPCreatePrivileged', 1);
 
-$importer->screendebug(1) if ($ENV{TEST_VERBOSE});
-
 # check that we don't import
 ok($importer->import_users());
 {
diff --git a/t/ldapimport/user-import.t b/t/ldapimport/user-import.t
index 1a92b46..c404bb5 100644
--- a/t/ldapimport/user-import.t
+++ b/t/ldapimport/user-import.t
@@ -50,8 +50,6 @@ RT->Config->Set('LDAPMapping',
 RT->Config->Set('LDAPBase','ou=foo,dc=bestpractical,dc=com');
 RT->Config->Set('LDAPFilter','(objectClass=User)');
 
-$importer->screendebug(1) if ($ENV{TEST_VERBOSE});
-
 # check that we don't import
 ok($importer->import_users());
 {

-----------------------------------------------------------------------