diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-19 12:06:02 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-19 15:17:43 +1100 |
| commit | 24e8bc544169eff6895d73045439ab32e7afa507 (patch) | |
| tree | 56c87199b88c23ddd0524f4b3e0907ae0010c301 | |
| parent | 999f3ed2ce656ecf97b95afa85823115939f9360 (diff) | |
| download | samba-24e8bc544169eff6895d73045439ab32e7afa507.tar.gz | |
wintest: moved to top level
the plan is to expand wintest to test a lot more of Samba against
windows, including testing the Samba3 file server, winbind, nmbd etc
| -rwxr-xr-x | wintest/test-howto.py (renamed from source4/scripting/devel/wintest/test-howto.py) | 10 | ||||
| -rw-r--r-- | wintest/tridge.conf (renamed from source4/scripting/devel/wintest/tridge.conf) | 0 | ||||
| -rw-r--r-- | wintest/wintest.py (renamed from source4/scripting/devel/wintest/wintest.py) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/devel/wintest/test-howto.py b/wintest/test-howto.py index 402519fad6c..6afea1a89bb 100755 --- a/source4/scripting/devel/wintest/test-howto.py +++ b/wintest/test-howto.py @@ -150,7 +150,7 @@ def test_winjoin(t, vm): def run_dcpromo(t, vm): '''run a dcpromo on windows''' t.setwinvars(vm) - + t.info("Joining a windows VM ${WIN_VM} to the domain as a DC using dcpromo") t.vm_poweroff("${WIN_VM}", checkfail=False) t.vm_restore("${WIN_VM}", "${WIN_SNAPSHOT}") @@ -523,7 +523,7 @@ def test_howto(t): test_kerberos(t) if not t.skip("dyndns"): test_dyndns(t) - + if t.have_var('WINDOWS7_VM') and not t.skip("windows7"): run_winjoin(t, "WINDOWS7") test_winjoin(t, "WINDOWS7") @@ -531,7 +531,7 @@ def test_howto(t): if t.have_var('WINXP_VM') and not t.skip("winxp"): run_winjoin(t, "WINXP") test_winjoin(t, "WINXP") - + if t.have_var('W2K8R2C_VM') and not t.skip("dcpromo_rodc"): t.info("Testing w2k8r2 RODC dcpromo") run_dcpromo_rodc(t, "W2K8R2C") @@ -560,7 +560,7 @@ def test_howto(t): test_dyndns(t) run_dcpromo(t, "W2K3B") test_dcpromo(t, "W2K3B") - + if t.have_var('W2K8R2A_VM') and not t.skip("join_w2k8r2"): join_as_dc(t, "W2K8R2A") create_shares(t) @@ -574,7 +574,7 @@ def test_howto(t): start_s4(t, interfaces='${INTERFACES}') test_dyndns(t) test_join_as_rodc(t, "W2K8R2A") - + if t.have_var('W2K3A_VM') and not t.skip("join_w2k3"): join_as_dc(t, "W2K3A") create_shares(t) diff --git a/source4/scripting/devel/wintest/tridge.conf b/wintest/tridge.conf index 12885264f29..12885264f29 100644 --- a/source4/scripting/devel/wintest/tridge.conf +++ b/wintest/tridge.conf diff --git a/source4/scripting/devel/wintest/wintest.py b/wintest/wintest.py index f871462fbae..f871462fbae 100644 --- a/source4/scripting/devel/wintest/wintest.py +++ b/wintest/wintest.py |