Ge van Geldorp : netapi32/tests: Fix tests on Win7.

Alexandre Julliard julliard at winehq.org
Mon Aug 24 10:09:36 CDT 2009


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

Author: Ge van Geldorp <ggeldorp at vmware.com>
Date:   Mon Aug 24 14:19:11 2009 +0200

netapi32/tests: Fix tests on Win7.

---

 dlls/netapi32/tests/wksta.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c
index e0c16d3..c5929de 100644
--- a/dlls/netapi32/tests/wksta.c
+++ b/dlls/netapi32/tests/wksta.c
@@ -173,7 +173,8 @@ static void run_wkstatransportenum_tests(void)
 
         ok(bufPtr != NULL, "got data back\n");
         ok(entriesRead > 0, "read at least one transport\n");
-        ok(totalEntries > 0, "at least one transport\n");
+        ok(totalEntries > 0 || broken(totalEntries == 0) /* Win7 */,
+           "at least one transport\n");
         pNetApiBufferFree(bufPtr);
     }
 }
@@ -198,7 +199,10 @@ START_TEST(wksta)
     }
 
     if (init_wksta_tests()) {
-        run_get_comp_name_tests();
+        if (pNetpGetComputerName)
+            run_get_comp_name_tests();
+        else
+            win_skip("Function NetpGetComputerName not available\n");
         run_wkstausergetinfo_tests();
         run_wkstatransportenum_tests();
     }




More information about the wine-cvs mailing list