2 files changed, 39 insertions, 1 deletions
diff --git a/selftest/tests/__init__.py b/selftest/tests/__init__.py
index 3de290c89c..5ff1f6b8d2 100644
--- a/selftest/tests/__init__.py
+++ b/selftest/tests/__init__.py
@@ -25,7 +25,7 @@ import unittest
 
 def test_suite():
     result = unittest.TestSuite()
-    names = ['socket_wrapper', 'target', 'testlist']
+    names = ['socket_wrapper', 'target', 'testlist', 'run']
     module_names = ['selftest.tests.test_' + name for name in names]
     loader = unittest.TestLoader()
     result.addTests(loader.loadTestsFromNames(module_names))
diff --git a/selftest/tests/test_run.py b/selftest/tests/test_run.py
new file mode 100644
index 0000000000..040c143895
--- /dev/null
+++ b/selftest/tests/test_run.py
@@ -0,0 +1,38 @@
+# test_run.py -- Tests for selftest.run
+# Copyright (C) 2012 Jelmer Vernooij <jelmer@samba.org>
+#
+# 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; version 3
+# of the License or (at your option) any later version of
+# the License.
+#
+# 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+
+"""Tests for selftest.run."""
+
+from selftest.run import expand_environment_strings
+
+from selftest.tests import TestCase
+
+
+class ExpandEnvironmentStringsTests(TestCase):
+
+    def test_no_vars(self):
+        self.assertEquals("foo bar", expand_environment_strings("foo bar", {}))
+
+    def test_simple(self):
+        self.assertEquals("foo bar",
+            expand_environment_strings("foo $BLA", {"BLA": "bar"}))
+
+    def test_unknown(self):
+        self.assertEquals("foo $BLA",
+            expand_environment_strings("foo $BLA", {}))