sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

tests: Avoid hardcoding domain in test

Browse Source 
Currently the sysvol domain directory is hard-coded, so the tests can
only ever run on the ad_dc.

This patch makes things marginally better by using the REALM
environmental variable instead. This allows us to run it against other
testenvs (like the SMBv2-only restoredc).

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

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Tim Beale
2018-12-12 10:04:09 +13:00
committed by Tim Beale
parent c95a869e85
commit 7f731d7642
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/samba/tests/smb.py
View File

@ -27,13 +27,14 @@ from samba.samba3 import libsmb_samba_internal
from samba.samba3 import param as s3param
PY3 = sys.version_info[0] == 3
addom = 'addom.samba.example.com/'
realm = os.environ.get('REALM')
domain_dir = realm.lower() + '/'
test_contents = 'abcd' * 256
utf_contents = u'Süßigkeiten Äpfel ' * 128
test_literal_bytes_embed_nulls = b'\xff\xfe\x14\x61\x00\x00\x62\x63\x64' * 256
binary_contents = b'\xff\xfe'
binary_contents = binary_contents + "Hello cruel world of python3".encode('utf8') * 128
test_dir = os.path.join(addom, 'testing_%d' % random.randint(0, 0xFFFF))
test_dir = os.path.join(domain_dir, 'testing_%d' % random.randint(0, 0xFFFF))
test_file = os.path.join(test_dir, 'testing').replace('/', '\\')
@ -60,7 +61,7 @@ class SMBTests(samba.tests.TestCase):
def test_list(self):
# check a basic listing returns the items we expect
ls = [f['name'] for f in self.smb_conn.list(addom)]
ls = [f['name'] for f in self.smb_conn.list(domain_dir)]
self.assertIn('scripts', ls,
msg='"scripts" directory not found in sysvol')
self.assertIn('Policies', ls,
@ -71,17 +72,17 @@ class SMBTests(samba.tests.TestCase):
msg='Current dir (.) found in directory listing')
# using a '*' mask should be the same as using no mask
ls_wildcard = [f['name'] for f in self.smb_conn.list(addom, "*")]
ls_wildcard = [f['name'] for f in self.smb_conn.list(domain_dir, "*")]
self.assertEqual(ls, ls_wildcard)
# applying a mask should only return items that match that mask
ls_pol = [f['name'] for f in self.smb_conn.list(addom, "Pol*")]
ls_pol = [f['name'] for f in self.smb_conn.list(domain_dir, "Pol*")]
expected = ["Policies"]
self.assertEqual(ls_pol, expected)
# each item in the listing is a has with expected keys
expected_keys = ['attrib', 'mtime', 'name', 'short_name', 'size']
for item in self.smb_conn.list(addom):
for item in self.smb_conn.list(domain_dir):
for key in expected_keys:
self.assertIn(key, item,
msg="Key '%s' not in listing '%s'" % (key, item))