From 8bcf74872a9cb2d1144ef2d2d80d38a23d6e5783 Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Wed, 8 Feb 2017 13:43:26 -0800 Subject: [PATCH] (POOLER-73) Restructure tests to unit and integration directories Previously all of the spec tests for VM Pooler were all together in the specs directory. However some tests require a working local Redis server to operate and other instead mock all external dependencies. This commit splits the test files between unit and integration, where integration tests require a working Redis instance, and unit tests do not. This commit also removes the root `vmpooler` directory as it is not required. The tests rake test still operates correctly. This commit also adds the mock_redis library for testing for the pool_manager. --- spec/{vmpooler => integration}/api/v1/status_spec.rb | 0 spec/{vmpooler => integration}/api/v1/token_spec.rb | 0 spec/{vmpooler => integration}/api/v1/vm_hostname_spec.rb | 0 spec/{vmpooler => integration}/api/v1/vm_spec.rb | 0 spec/{vmpooler => integration}/api/v1/vm_template_spec.rb | 0 spec/{vmpooler => integration}/dashboard_spec.rb | 0 spec/{vmpooler => unit}/api/helpers_spec.rb | 0 spec/{vmpooler => unit}/pool_manager_migration_spec.rb | 0 spec/{vmpooler => unit}/pool_manager_spec.rb | 1 + 9 files changed, 1 insertion(+) rename spec/{vmpooler => integration}/api/v1/status_spec.rb (100%) rename spec/{vmpooler => integration}/api/v1/token_spec.rb (100%) rename spec/{vmpooler => integration}/api/v1/vm_hostname_spec.rb (100%) rename spec/{vmpooler => integration}/api/v1/vm_spec.rb (100%) rename spec/{vmpooler => integration}/api/v1/vm_template_spec.rb (100%) rename spec/{vmpooler => integration}/dashboard_spec.rb (100%) rename spec/{vmpooler => unit}/api/helpers_spec.rb (100%) rename spec/{vmpooler => unit}/pool_manager_migration_spec.rb (100%) rename spec/{vmpooler => unit}/pool_manager_spec.rb (99%) diff --git a/spec/vmpooler/api/v1/status_spec.rb b/spec/integration/api/v1/status_spec.rb similarity index 100% rename from spec/vmpooler/api/v1/status_spec.rb rename to spec/integration/api/v1/status_spec.rb diff --git a/spec/vmpooler/api/v1/token_spec.rb b/spec/integration/api/v1/token_spec.rb similarity index 100% rename from spec/vmpooler/api/v1/token_spec.rb rename to spec/integration/api/v1/token_spec.rb diff --git a/spec/vmpooler/api/v1/vm_hostname_spec.rb b/spec/integration/api/v1/vm_hostname_spec.rb similarity index 100% rename from spec/vmpooler/api/v1/vm_hostname_spec.rb rename to spec/integration/api/v1/vm_hostname_spec.rb diff --git a/spec/vmpooler/api/v1/vm_spec.rb b/spec/integration/api/v1/vm_spec.rb similarity index 100% rename from spec/vmpooler/api/v1/vm_spec.rb rename to spec/integration/api/v1/vm_spec.rb diff --git a/spec/vmpooler/api/v1/vm_template_spec.rb b/spec/integration/api/v1/vm_template_spec.rb similarity index 100% rename from spec/vmpooler/api/v1/vm_template_spec.rb rename to spec/integration/api/v1/vm_template_spec.rb diff --git a/spec/vmpooler/dashboard_spec.rb b/spec/integration/dashboard_spec.rb similarity index 100% rename from spec/vmpooler/dashboard_spec.rb rename to spec/integration/dashboard_spec.rb diff --git a/spec/vmpooler/api/helpers_spec.rb b/spec/unit/api/helpers_spec.rb similarity index 100% rename from spec/vmpooler/api/helpers_spec.rb rename to spec/unit/api/helpers_spec.rb diff --git a/spec/vmpooler/pool_manager_migration_spec.rb b/spec/unit/pool_manager_migration_spec.rb similarity index 100% rename from spec/vmpooler/pool_manager_migration_spec.rb rename to spec/unit/pool_manager_migration_spec.rb diff --git a/spec/vmpooler/pool_manager_spec.rb b/spec/unit/pool_manager_spec.rb similarity index 99% rename from spec/vmpooler/pool_manager_spec.rb rename to spec/unit/pool_manager_spec.rb index 6bf00bd..5f16bf3 100644 --- a/spec/vmpooler/pool_manager_spec.rb +++ b/spec/unit/pool_manager_spec.rb @@ -1,5 +1,6 @@ require 'spec_helper' require 'time' +require 'mock_redis' describe 'Pool Manager' do let(:logger) { double('logger') }