Maarten Lankhorst : netapi32: Make the tests pass under XP that enforces a strict password policy.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a2d53016b5ac4c214379b33663d8261311aeab89
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a2d53016b5ac4c214379b33663...

Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com>
Date:   Mon May  5 12:12:25 2008 -0700

netapi32: Make the tests pass under XP that enforces a strict password policy.

---

 dlls/netapi32/tests/access.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c
index 7d5f55a..b1036a9 100644
--- a/dlls/netapi32/tests/access.c
+++ b/dlls/netapi32/tests/access.c
@@ -50,8 +50,8 @@ static WCHAR sTooLongPassword[] = {'a','b','c','d','e','f','g','h','a','b','c','
     'a', 0};
 
 static WCHAR sTestUserName[] = {'t', 'e', 's', 't', 'u', 's', 'e', 'r', 0};
-static WCHAR sTestUserOldPass[] = {'o', 'l', 'd', 'p', 'a', 's', 's', 0};
-static WCHAR sTestUserNewPass[] = {'n', 'e', 'w', 'p', 'a', 's', 's', 0};
+static WCHAR sTestUserOldPass[] = {'O', 'l', 'd', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0};
+static WCHAR sTestUserNewPass[] = {'N', 'e', 'w', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0};
 static const WCHAR sBadNetPath[] = {'\\','\\','B','a',' ',' ','p','a','t','h',0};
 static const WCHAR sInvalidName[] = {'\\',0};
 static const WCHAR sInvalidName2[] = {'\\','\\',0};
@@ -301,7 +301,10 @@ static void run_userhandling_tests(void)
 
     ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass,
             sTestUserOldPass);
-    ok(ret == NERR_Success,
+    /* Apparently NERR_PasswordTooShort can be returned on windows xp if a
+     * strict password policy is enforced
+     */
+    ok(ret == NERR_Success || ret == NERR_PasswordTooShort,
             "Changing old password to old password returned 0x%08x.\n", ret);
 
     ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserNewPass,