diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-05-22 16:09:10 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-05-22 16:09:10 +1000 |
commit | fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5 (patch) | |
tree | 6e6b4079ecf50b42b862d0f8accc392e5f061cb8 /source4/scripting/python/samba/tests/provision.py | |
parent | af82204f4355ac9011b61019bbbe40e7e3632d4c (diff) | |
parent | 8172f3eb220575d40f9ab5129d36e4e0003dee56 (diff) | |
download | samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.tar.gz samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.tar.xz samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.zip |
Merge commit 'origin/v4-0-test' into v4-0-test
(This used to be commit d7f3348c891e14de0e1b195714468ff998400f60)
Diffstat (limited to 'source4/scripting/python/samba/tests/provision.py')
-rw-r--r-- | source4/scripting/python/samba/tests/provision.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index b9e0e16d3ca..76c10145f0a 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -21,7 +21,7 @@ import os from samba.provision import setup_secretsdb, secretsdb_become_dc, findnss import samba.tests from ldb import Dn -import param +from samba import param import unittest lp = samba.tests.cmdline_loadparm |