From 65a03e55cde262e52b2266b2e35f533e145a5f60 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Tue, 7 Jan 2014 14:18:31 +0800
Subject: [PATCH] Move the tests from functionalnosetests

Move the tests from functionalnosetests under functional, so we no
longer have two seperate trees for functional tests. This also drops
the 'nose' name from the directory, so that it doesn't end up with
confusion if we move to testr. Further, since there are no longer two
test runs in .functests, it nows looks very close to the other two.

Change-Id: I8de025c29d71f05072e257df24899927b82c1382
---
 .functests                                               | 9 ++-------
 .../{functionalnosetests => functional}/swift_testing.py | 0
 test/{functionalnosetests => functional}/test_account.py | 0
 .../test_container.py                                    | 0
 test/{functionalnosetests => functional}/test_object.py  | 0
 test/functionalnosetests/__init__.py                     | 0
 6 files changed, 2 insertions(+), 7 deletions(-)
 rename test/{functionalnosetests => functional}/swift_testing.py (100%)
 rename test/{functionalnosetests => functional}/test_account.py (100%)
 rename test/{functionalnosetests => functional}/test_container.py (100%)
 rename test/{functionalnosetests => functional}/test_object.py (100%)
 delete mode 100644 test/functionalnosetests/__init__.py

diff --git a/.functests b/.functests
index d4190f5675..65a9ea191c 100755
--- a/.functests
+++ b/.functests
@@ -4,12 +4,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
 
 cd ${SRC_DIR}/test/functional
 nosetests --exe $@
-func1=$?
+rvalue=$?
 cd -
 
-cd ${SRC_DIR}/test/functionalnosetests
-nosetests --exe $@
-func2=$?
-cd -
-
-exit $((func1 + func2))
+exit $rvalue
diff --git a/test/functionalnosetests/swift_testing.py b/test/functional/swift_testing.py
similarity index 100%
rename from test/functionalnosetests/swift_testing.py
rename to test/functional/swift_testing.py
diff --git a/test/functionalnosetests/test_account.py b/test/functional/test_account.py
similarity index 100%
rename from test/functionalnosetests/test_account.py
rename to test/functional/test_account.py
diff --git a/test/functionalnosetests/test_container.py b/test/functional/test_container.py
similarity index 100%
rename from test/functionalnosetests/test_container.py
rename to test/functional/test_container.py
diff --git a/test/functionalnosetests/test_object.py b/test/functional/test_object.py
similarity index 100%
rename from test/functionalnosetests/test_object.py
rename to test/functional/test_object.py
diff --git a/test/functionalnosetests/__init__.py b/test/functionalnosetests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000