1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Commit Graph

76 Commits

Author SHA1 Message Date
Douglas Bagnall
6972b53f50 wintest: py3 telnet.sendline() doesn't like string with ^Z
Try using bytes instead.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2019-07-02 04:21:36 +00:00
Joe Guo
c65a70781d PY3: change shebang to python3 in wintest dir
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
2018-12-14 14:40:20 +01:00
Joe Guo
aa243d1a7f PEP8: fix W291: trailing whitespace
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:31 +02:00
Joe Guo
9f5bbcc10a PEP8: fix E713: test for membership should be 'not in'
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:31 +02:00
Joe Guo
e940e4cd48 PEP8: fix E711: comparison to None should be 'if cond is not None:'
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:30 +02:00
Joe Guo
cabb299749 PEP8: fix E703: statement ends with a semicolon
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:30 +02:00
Joe Guo
7b031b01a1 PEP8: fix E502: the backslash is redundant between brackets
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:30 +02:00
Joe Guo
95c36d825c PEP8: fix E401: multiple imports on one line
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:30 +02:00
Joe Guo
fd6b2086cb PEP8: fix E303: too many blank lines (2)
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:30 +02:00
Joe Guo
211c9a5f85 PEP8: fix E302: expected 2 blank lines, found 1
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:29 +02:00
Joe Guo
7a07d42230 PEP8: fix E265: block comment should start with '# '
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:29 +02:00
Joe Guo
c809a86023 PEP8: fix E261: at least two spaces before inline comment
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:29 +02:00
Joe Guo
12d3fbe15c PEP8: fix E231: missing whitespace after ','
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:28 +02:00
Joe Guo
87bbc2df97 PEP8: fix E226: missing whitespace around arithmetic operator
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:28 +02:00
Joe Guo
32266d2d48 PEP8: fix E225: missing whitespace around operator
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:28 +02:00
Joe Guo
562411bd95 PEP8: fix E202: whitespace before ')'
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:27 +02:00
Joe Guo
5d532543ab PEP8: fix E128: continuation line under-indented for visual indent
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:27 +02:00
Joe Guo
ada5af53f7 PEP8: whitespace fixes in wintest.py
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2018-08-24 07:49:25 +02:00
Andreas Schneider
8f2dee256e python:samba: Use 'binddns dir' in samba-tool and samba_upgradedns
This provisions the bind_dlz files in the 'binddns dir'. If you want to
migrate to the new files strcuture you can run samba_upgradedns!

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12957

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
2017-09-05 23:58:20 +02:00
Andrew Bartlett
d78369789a wintest: Try harder to make wintest force the telnet server to start
We try and force the server to start, and we try to force the
TelnetClients group to exist

Change-Id: I192f0aaaf283b77065ecc671ca2b59a69781d744
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-on: https://gerrit.samba.org/36
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Mar 14 14:51:20 CET 2014 on sn-devel-104
2014-03-14 14:51:20 +01:00
Andrew Bartlett
abbbbb5cdc wintest: Try harder to recover from apparent failure to dcpromo
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2012-11-06 08:27:44 +11:00
Andrew Bartlett
10eba77dcb wintest: Give netdom join more time to complete 2012-10-03 14:25:57 +02:00
Andrew Bartlett
ee4d1c4062 wintest: Rework support for the internal DNS server
We still have to run BIND, the change is if BIND is run to support our own
zone, or if we forward to as well as to windows.

This also adapts to the new defaults.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-09-12 16:51:29 +02:00
Stefan Metzmacher
5cac79abce wintest: try to fix settings for the internal dns server
metze
2012-09-12 16:51:29 +02:00
Kai Blin
56058ea597 s4 dns: use the internal DNS server per default 2012-09-12 16:51:29 +02:00
Björn Baumbach
cea3bdb103 wintest: enable dns forwarding for internal dns
Internal DNS will forward dns requests to the original nameserver
(specified in resolv.conf).

Signed-off-by: Kai Blin <kai@samba.org>

Autobuild-User(master): Kai Blin <kai@samba.org>
Autobuild-Date(master): Thu Jun 21 23:47:35 CEST 2012 on sn-devel-104
2012-06-21 23:47:35 +02:00
Björn Baumbach
1318b5bb2c wintest: get original nameserver for forwarding on a more general place
Signed-off-by: Kai Blin <kai@samba.org>
2012-06-21 21:55:20 +02:00
Björn Baumbach
5305570758 wintest: extend get_is_dc function with additional expectations
Windows Server 2003 r2 answers "wintest2k3 is not a DC."

Signed-off-by: Kai Blin <kai@samba.org>
2012-06-21 21:55:20 +02:00
Björn Baumbach
884e28f66b wintest: check netcats exitstatus instead of output
There are many netcat implementations with different output messages.

Signed-off-by: Kai Blin <kai@samba.org>
2012-06-21 21:55:20 +02:00
Björn Baumbach
ed3ded1122 wintest: set recursive queries for internal dns
Need dns recursive queries = yes, since
host expects answers with RA-bit.

Signed-off-by: Kai Blin <kai@samba.org>
2012-06-21 21:55:20 +02:00
Björn Baumbach
b45d4beca5 wintest: add option to select the dns backend
This is an option to use the internal dns.

Signed-off-by: Kai Blin <kai@samba.org>
2012-06-21 21:55:20 +02:00
Björn Baumbach
09bee254f0 wintest: set nameserver on a more general place
Signed-off-by: Kai Blin <kai@samba.org>
2012-06-21 21:55:20 +02:00
Björn Baumbach
226dbc116d wintest: add option to use ntvfs instead of s3fs
Signed-off-by: Kai Blin <kai@samba.org>
2012-06-21 21:55:20 +02:00
Michael Adam
f866755015 wintest: introduce a variable to contain the (relative) path of smbclient 2012-05-31 18:23:42 +10:00
Andrew Bartlett
071f3c15f2 wintest: give host longer to register the SRV record 2012-02-17 17:36:37 +11:00
Andrew Bartlett
a7569b68f9 wintest: use net rpc to put authenticated users into TelentClients if we need to 2012-02-17 17:36:37 +11:00
Andrew Bartlett
111f8f4a7c wintest: Allow Windows VM to have no default route 2012-02-17 17:36:37 +11:00
Andrew Bartlett
61ccb465db wintest: Give the Windows VM a little more time to start back up 2012-02-16 15:20:10 +11:00
Andrew Bartlett
98e438df00 wintest: Cope with nc not timing out even when -w 1 is specified 2012-02-16 15:20:09 +11:00
Andrew Bartlett
15a0de66cb wintest: Allow access denied when turning off the firewall 2012-02-16 15:20:09 +11:00
Andrew Bartlett
2ba57f42b8 wintest: Retry joining the domain a few times 2012-02-16 15:20:09 +11:00
Andrew Bartlett
032a2c4ce3 wintest: connect to correct hostname in test_net_use 2012-02-16 15:20:09 +11:00
Andrew Bartlett
1367e2b303 wintest Allow setting of the firewall to fail
This is also required to allow a telnet connection as non-admin.

Andrew Bartlett
2011-04-07 14:35:36 +10:00
Andrew Bartlett
e410a1af30 s3-wintest Add test of 'net use' against the Samba3 member 2011-04-07 14:35:36 +10:00
Andrew Bartlett
9ced0df379 wintest Allow changing the telnet settings to fail, we might not be admin
This allows us to test logging in as non-admin users over telnet
2011-04-07 14:35:36 +10:00
Andrew Tridgell
22cbd04fd7 wintest: fixed syntax highlighting with emacs 2011-03-29 00:00:22 +02:00
Andrew Tridgell
949427c208 python: use os.environ[] instead of os.putenv()
using os.putenv() causes too much confusion, as it doesn't update
os.getenv()

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-22 02:51:10 +01:00
Andrew Bartlett
5425227b55 wintest upper case the --vms paramter arguments to wintest.py
This makes it easier to specify
2011-02-17 05:56:04 +01:00
Zahari Zahariev
94b149f3cb Typos in wintest 2010-12-16 15:54:29 +11:00
Andrew Bartlett
6510414ef0 wintest Add testing of kerberos connections to Windows members of an AD domain
This improves the Samba3 wintest script to test against Windows7 and
WinXP domain members, and Windows7 standalone servers.  To do this,
more of the samba4 script is put in common, and we splut up the
starting of the VMs from the preperation of the VM.

This also improves the nmblookup command parsing to cope with both the
samba3 and samba4 nmblookup commands.

A krb5.conf is now provided for both s3 and s4 tests.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Dec 14 01:54:46 CET 2010 on sn-devel-104
2010-12-14 01:54:46 +01:00