Put testtools directly under lib/ to make it easier to install from Samba 4.

diff --git a/lib/subunit/update.sh b/lib/subunit/update.sh
deleted file mode 100755 (executable)
index 1b27ba6..0000000
--- a/lib/subunit/update.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Pull in a new snapshot of Subunit from the upstream bzr branch
-
-TARGETDIR="`dirname $0`"
-WORKDIR="`mktemp -d`"
-
-bzr export "$WORKDIR/subunit" lp:subunit 
-bzr export "$WORKDIR/testtools" lp:testtools 
-
-for p in python/ filters/ perl/
-do
-       rsync -avz --delete "$WORKDIR/subunit/$p" "$TARGETDIR/$p"
-done
-
-rsync -avz --delete "$WORKDIR/testtools/testtools/" "$TARGETDIR/python/testtools/"
-
-rm -rf "$WORKDIR"

diff --git a/lib/subunit/python/testtools/__init__.py b/lib/testtools/__init__.py
similarity index 100%
rename from lib/subunit/python/testtools/__init__.py
rename to lib/testtools/__init__.py

diff --git a/lib/subunit/python/testtools/content.py b/lib/testtools/content.py
similarity index 100%
rename from lib/subunit/python/testtools/content.py
rename to lib/testtools/content.py

diff --git a/lib/subunit/python/testtools/content_type.py b/lib/testtools/content_type.py
similarity index 100%
rename from lib/subunit/python/testtools/content_type.py
rename to lib/testtools/content_type.py

diff --git a/lib/subunit/python/testtools/matchers.py b/lib/testtools/matchers.py
similarity index 100%
rename from lib/subunit/python/testtools/matchers.py
rename to lib/testtools/matchers.py

diff --git a/lib/subunit/python/testtools/run.py b/lib/testtools/run.py
similarity index 100%
rename from lib/subunit/python/testtools/run.py
rename to lib/testtools/run.py

diff --git a/lib/subunit/python/testtools/runtest.py b/lib/testtools/runtest.py
similarity index 100%
rename from lib/subunit/python/testtools/runtest.py
rename to lib/testtools/runtest.py

diff --git a/lib/subunit/python/testtools/testcase.py b/lib/testtools/testcase.py
similarity index 100%
rename from lib/subunit/python/testtools/testcase.py
rename to lib/testtools/testcase.py

diff --git a/lib/subunit/python/testtools/testresult/__init__.py b/lib/testtools/testresult/__init__.py
similarity index 100%
rename from lib/subunit/python/testtools/testresult/__init__.py
rename to lib/testtools/testresult/__init__.py

diff --git a/lib/subunit/python/testtools/testresult/doubles.py b/lib/testtools/testresult/doubles.py
similarity index 100%
rename from lib/subunit/python/testtools/testresult/doubles.py
rename to lib/testtools/testresult/doubles.py

diff --git a/lib/subunit/python/testtools/testresult/real.py b/lib/testtools/testresult/real.py
similarity index 100%
rename from lib/subunit/python/testtools/testresult/real.py
rename to lib/testtools/testresult/real.py

diff --git a/lib/subunit/python/testtools/tests/__init__.py b/lib/testtools/tests/__init__.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/__init__.py
rename to lib/testtools/tests/__init__.py

diff --git a/lib/subunit/python/testtools/tests/helpers.py b/lib/testtools/tests/helpers.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/helpers.py
rename to lib/testtools/tests/helpers.py

diff --git a/lib/subunit/python/testtools/tests/test_content.py b/lib/testtools/tests/test_content.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/test_content.py
rename to lib/testtools/tests/test_content.py

diff --git a/lib/subunit/python/testtools/tests/test_content_type.py b/lib/testtools/tests/test_content_type.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/test_content_type.py
rename to lib/testtools/tests/test_content_type.py

diff --git a/lib/subunit/python/testtools/tests/test_matchers.py b/lib/testtools/tests/test_matchers.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/test_matchers.py
rename to lib/testtools/tests/test_matchers.py

diff --git a/lib/subunit/python/testtools/tests/test_runtest.py b/lib/testtools/tests/test_runtest.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/test_runtest.py
rename to lib/testtools/tests/test_runtest.py

diff --git a/lib/subunit/python/testtools/tests/test_testresult.py b/lib/testtools/tests/test_testresult.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/test_testresult.py
rename to lib/testtools/tests/test_testresult.py

diff --git a/lib/subunit/python/testtools/tests/test_testsuite.py b/lib/testtools/tests/test_testsuite.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/test_testsuite.py
rename to lib/testtools/tests/test_testsuite.py

diff --git a/lib/subunit/python/testtools/tests/test_testtools.py b/lib/testtools/tests/test_testtools.py
similarity index 100%
rename from lib/subunit/python/testtools/tests/test_testtools.py
rename to lib/testtools/tests/test_testtools.py

diff --git a/lib/subunit/python/testtools/testsuite.py b/lib/testtools/testsuite.py
similarity index 100%
rename from lib/subunit/python/testtools/testsuite.py
rename to lib/testtools/testsuite.py

diff --git a/lib/subunit/python/testtools/utils.py b/lib/testtools/utils.py
similarity index 100%
rename from lib/subunit/python/testtools/utils.py
rename to lib/testtools/utils.py

diff --git a/lib/update-external.sh b/lib/update-external.sh
new file mode 100755 (executable)
index 0000000..7cf95f3
--- /dev/null
+++ b/lib/update-external.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Pull in a new snapshot of external projects that are included in 
+# our source tree for users that don't have them installed on their system
+
+TARGETDIR="`dirname $0`"
+WORKDIR="`mktemp -d`"
+
+echo "Updating subunit..."
+bzr export "$WORKDIR/subunit" lp:subunit 
+for p in python/ filters/ perl/
+do
+       rsync -avz --delete "$WORKDIR/subunit/$p" "$TARGETDIR/subunit/$p"
+done
+
+echo "Updating testtools..."
+bzr export "$WORKDIR/testtools" lp:testtools 
+rsync -avz --delete "$WORKDIR/testtools/testtools/" "$TARGETDIR/testtools/"
+
+rm -rf "$WORKDIR"