r26369: Start on tests for the upgrade python code.

(This used to be commit c4458d11c710d4f0f892b26c7cb0701a43273587)

2 files changed, 30 insertions, 0 deletions

diff --git a/source4/scripting/python/samba/tests/upgrade.py b/source4/scripting/python/samba/tests/upgrade.py
new file mode 100644
index 0000000000..f46d869656
--- /dev/null
+++ b/source4/scripting/python/samba/tests/upgrade.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+#   
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from samba.upgrade import regkey_to_dn
+from unittest import TestCase
+
+class RegkeyDnTests(TestCase):
+    def test_empty(self):
+        self.assertEquals("hive=NONE", regkey_to_dn(""))
+
+    def test_nested(self):
+        self.assertEquals("key=foo,key=bar,hive=NONE", regkey_to_dn("foo/bar"))
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 49aee3f94d..1908e3ea55 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -15,6 +15,7 @@ from uuid import uuid4
 from param import default_configuration
 
 def regkey_to_dn(name):
+    """Convert a registry key to a DN."""
 	dn = "hive=NONE"
 
     for el in name.split("/")[1:]:
@@ -191,6 +192,7 @@ unixID: %d""" % (m.sid, domaindn, m.sid, m.type, m.unix_id)
 	return ldif
 
 def upgrade_wins(samba3):
+    """Upgrade the WINS database."""
 	ldif = ""
 	version_id = 0