Enhancement More Test Unifications

- More functional consolidations to the FunctionalTest class
Merge branch 'master' into enhancement_more_test_unifications

Conflicts:
	deuce/tests/__init__.py
Merge branch 'master' into enhancement_more_test_unifications
Merge branch 'master' into enhancement_more_test_unifications
Bug Fix

- Incoming test was broken due to function name change on this branch
Test Refactor

- Added DriverTest class for all driver tests to derive from
--- has an abstract create_driver() that is used
--- Each driver test now becomes the create_driver() and only what it has to test in addition to the standard tests
- Refactored Swift Driver test to use python mock instead of the mock_drop_connection_status functionality in the mocked driver
- Reduced tests
--- ancestory, geneology, basic construction are only implemented in the main test instead of each derived test
Merge branch 'master' into enhancement_more_test_unifications
Merge branch 'master' into enhancement_more_test_unifications

Conflicts:
	deuce/tests/__init__.py
	deuce/tests/test_disk_storage_driver.py
	deuce/tests/test_swift_storage_driver.py
Tox resolutions for last merge

- Last merge left a pep8 failure and a nosetest failure; this resolves both
Test Consolidation - Controllers

- Added ControllerTest class in parallel to DriverTest class under FunctionalTest
- Refactored Controller tests to use the new ControllerTest class
- Moved functions that are or could be common to the new ControllerTest from the individual controllers test
--- Left helper functions that performed assertions
Test Consolidation - Hooks

- Added HookTest class in parallel to ControllerTest class under FunctionalTest
- Refactored OpenStack Hook and OpenStack Swift Hook Tests to use new HookTest class
- Defined a new create_hook() function so we can generalize some, updated tests accordingly
Test update

- Only the OpenStack Hook, OpenStack Swift Hook, and Swift Driver tests need an Auth Token. Nothing else needs to reference a token.

Note: Exception is the Py3k Swift Client test
Cleanup

- Removed duplicate function by alternate name
Cleanup

- Unused variable with unknown meaning
Cleanup & Bug Fix

- Cleaned up imports so each test only imports what it needs
- OpenStack Swift Hook Test had a bug
--- the final test was still mocking b64decode; fixing this revealed problems in other tests
--- fixed the other tests so that the json data was in byte form by forcing an encoding
Merge pull request #135 from BenjamenMeyer/enhancement_more_test_unifications

Test Cleanups - Improving ability to re-use functionality
fix: typo

Fixes an obvious typo in schema.cql
Merge remote-tracking branch 'upstream/master' into merge_conflict_resolve

Conflicts:
	deuce/hooks/openstackswifthook.py
	deuce/tests/__init__.py
	deuce/tests/test_blocks_controller.py
	deuce/tests/test_disk_storage_driver.py
	deuce/tests/test_files_controller.py
	deuce/tests/test_files_model.py
	deuce/tests/test_functional.py
	deuce/tests/test_health_controller.py
	deuce/tests/test_home_controller.py
	deuce/tests/test_model.py
	deuce/tests/test_openstackhook.py
	deuce/tests/test_openstackswifthook.py
	deuce/tests/test_p3kswiftclient.py
	deuce/tests/test_sqlite_storage_driver.py
	deuce/tests/test_swift_storage_driver.py
	deuce/tests/test_utils.py
	deuce/tests/test_validation.py
	deuce/tests/test_vault_controller.py
Merge pull request #158 from TheSriram/merge_conflict_resolve

Merge conflict resolve