15 files changed, 1 insertions, 130 deletions
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/change-abandoned-event.txt b/testdata/change-abandoned-event.txt
index 879ea28..879ea28 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/change-abandoned-event.txt
+++ b/testdata/change-abandoned-event.txt
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/change-merged-event.txt b/testdata/change-merged-event.txt
index 4da678a..4da678a 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/change-merged-event.txt
+++ b/testdata/change-merged-event.txt
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/change-restored-event.txt b/testdata/change-restored-event.txt
index e0300a8..e0300a8 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/change-restored-event.txt
+++ b/testdata/change-restored-event.txt
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/comment-added-event.txt b/testdata/comment-added-event.txt
index 9ab50f7..9ab50f7 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/comment-added-event.txt
+++ b/testdata/comment-added-event.txt
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/draft-published-event.txt b/testdata/draft-published-event.txt
index 8c3453a..8c3453a 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/draft-published-event.txt
+++ b/testdata/draft-published-event.txt
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/patchset-created-event.txt b/testdata/patchset-created-event.txt
index 2c464be..2c464be 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/patchset-created-event.txt
+++ b/testdata/patchset-created-event.txt
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/ref-updated-event.txt b/testdata/ref-updated-event.txt
index 61944cc..61944cc 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/ref-updated-event.txt
+++ b/testdata/ref-updated-event.txt
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/user-defined-event.txt b/testdata/user-defined-event.txt
index 7f7b65e..7f7b65e 100644
--- a/tests/gerrit_events/unittest_gerrit_stream_events/user-defined-event.txt
+++ b/testdata/user-defined-event.txt
diff --git a/tests/Makefile b/tests/Makefile
deleted file mode 100644
index d1a1f40..0000000
--- a/tests/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# This makefile executes all tests found in the current directory. The
-# tests are divided in categories, typically connected to a particular
-# script, and the actual testcases are defined in the directory
-# <category>/<testcase>.
-#
-# Each testcase directory can contain the following special files:
-#
-#    command     A shell script (doesn't have to be executable) that
-#                will be invoked by sh to run the testcase.
-#    input       Will be fed to the stdin stream of the command script.
-#    output      The expected stdout output of the command script.
-#                If present, the actual output will be compared to the
-#                contents of this file.
-#    status      The expected exit status of the command script,
-#                expressed as an integer.
-#
-# In addition to this, users are encouraged to include a file README that
-# explains the purpose of the testcase in question.
-#
-# Command scripts will be run with the parent directory of the
-# makefile as current directory (should be the top directory of the
-# git). To access files stored in the testcase directory the $TESTDIR
-# variable is available.
-#
-# In addition to the `all' default goal, each test category gets its
-# own make goal, i.e. if you have a category (and subdirectory) named
-# `mytests', you can run just these tests with `make mytests'.
-#
-
-# Only testcases with a `command' file are considered.
-ALL_CATEGORIES := \
-    $(sort $(foreach t,$(wildcard */*/command),$(firstword $(subst /, ,$(t)))))
-
-.PHONY: all
-all: $(ALL_CATEGORIES)
-	@echo All tests successful
-
-define create-category
-$(eval .PHONY: $(1)
-$(1):
-	@./test_category.sh $(1) ..
-)
-endef
-
-$(foreach category,$(ALL_CATEGORIES),\
-    $(call create-category,$(category)))
diff --git a/tests/gerrit_events/command-unittest b/tests/gerrit_events/command-unittest
deleted file mode 100755
index d188609..0000000
--- a/tests/gerrit_events/command-unittest
+++ /dev/null
@@ -1,3 +0,0 @@
-export PYTHONPATH=$PYTHONPATH:`pwd`
-
-$TESTDIR/unittests.py
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/README b/tests/gerrit_events/unittest_gerrit_stream_events/README
deleted file mode 100644
index fb55dc9..0000000
--- a/tests/gerrit_events/unittest_gerrit_stream_events/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Checks that the event handling works properly in the
-GerritStream class.
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/command b/tests/gerrit_events/unittest_gerrit_stream_events/command
deleted file mode 100644
index d188609..0000000
--- a/tests/gerrit_events/unittest_gerrit_stream_events/command
+++ /dev/null
@@ -1,3 +0,0 @@
-export PYTHONPATH=$PYTHONPATH:`pwd`
-
-$TESTDIR/unittests.py
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/status b/tests/gerrit_events/unittest_gerrit_stream_events/status
deleted file mode 100644
index 573541a..0000000
--- a/tests/gerrit_events/unittest_gerrit_stream_events/status
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/test_category.sh b/tests/test_category.sh
deleted file mode 100755
index 8f8b982..0000000
--- a/tests/test_category.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-ERROUTPUT=`mktemp`
-TESTOUTPUT=`mktemp`
-
-cleanup()
-{
-    rm -f $ERROUTPUT 2> /dev/null
-    rm -f $TESTOUTPUT 2> /dev/null
-    return 0
-}
-
-fatal()
-{
-    echo '***' "$@" >&2
-    cleanup
-    exit 1
-}
-
-CATEGORY=$1
-ROOTDIR=$2
-TESTS=`ls $CATEGORY/*/command 2> /dev/null | sed 's|/command||; s|.*/||' | sort`
-
-if [ -z "$CATEGORY" ] ; then
-    fatal No test directory specified.
-fi
-if [ -z "$ROOTDIR" -o ! -d "$ROOTDIR" ] ; then
-    fatal No valid test root directory specified.
-fi
-
-echo Running tests for $CATEGORY
-for TEST in $TESTS ; do
-    echo "    $TEST"
-    export TESTDIR=`pwd`/$CATEGORY/$TEST
-
-    if [ -f $TESTDIR/input -a -f $TESTDIR/output ] ; then
-        ( cd $ROOTDIR && sh $TESTDIR/command ) \
-            < $TESTDIR/input 2> $ERROUTPUT > $TESTOUTPUT
-        EXITSTATUS=$?
-    elif [ -f $TESTDIR/input ] ; then
-        ( cd $ROOTDIR && sh $TESTDIR/command ) \
-            < $TESTDIR/input 2> $ERROUTPUT > /dev/null
-        EXITSTATUS=$?
-    elif [ -f $TESTDIR/output ] ; then
-        ( cd $ROOTDIR && sh $TESTDIR/command ) 2> $ERROUTPUT > $TESTOUTPUT
-        EXITSTATUS=$?
-    elif [ -f $TESTDIR/status ] ; then
-        ( cd $ROOTDIR && sh $TESTDIR/command ) 2> $ERROUTPUT > /dev/null
-        EXITSTATUS=$?
-    fi
-
-    if [ ! -f $TESTDIR/status -a ! -f $TESTDIR/output ] ; then
-        fatal "Bad test case; no expected output or exit status provided."
-    fi
-
-    if [ -f $TESTDIR/status ] ; then
-        EXPECTED_STATUS=`cat $TESTDIR/status`
-        if [ "$EXITSTATUS" != "$EXPECTED_STATUS" ] ; then
-            cat $ERROUTPUT >&2
-            fatal "Bad exit status; expected $EXPECTED_STATUS, got $EXITSTATUS."
-        fi
-    fi
-
-    if [ -f $TESTDIR/output ] ; then
-        if ! cmp -s $TESTDIR/output $TESTOUTPUT ; then
-            diff -u $TESTDIR/output $TESTOUTPUT | \
-                sed -e '1s/--- [^ ][^ ]*/--- expected-output/' \
-                    -e '2s/+++ [^ ][^ ]*/+++ actual-output/'
-            fatal "Unexpected command output (see diff above)."
-        fi
-    fi
-done
-cleanup
diff --git a/tests/gerrit_events/unittest_gerrit_stream_events/unittests.py b/unittests.py
index 8d3db09..6665494 100755
--- a/tests/gerrit_events/unittest_gerrit_stream_events/unittests.py
+++ b/unittests.py
@@ -32,7 +32,7 @@ def _create_event(name, gerrit):
     data, then add as an event in the `gerrit` client.
 
     """
-    data = open(os.path.join(os.environ["TESTDIR"], name + ".txt"))
+    data = open(os.path.join("testdata", name + ".txt"))
     json_data = json.loads(data.read().replace("\n", ""))
     gerrit.put_event(json_data)