From 45b07177e94cbb502997a95f4b98f1e15a9e6ea5 Mon Sep 17 00:00:00 2001
From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Thu, 13 Oct 2016 15:27:53 +0300
Subject: [PATCH] Move unit tests to a separate folder

Until recently, os-win did not have any functional tests. As we're
now starting to add such tests, we need to clearly separate unit
tests.

Note that most OpenStack projects have already done this separation.

This change moves the unit tests to a separate folder.

Change-Id: I1649fae7095f9b4024e526358ac70a58189365bf
---
 README.rst                                                      | 2 +-
 os_win/tests/{utils => unit}/__init__.py                        | 0
 os_win/tests/{ => unit}/test_base.py                            | 0
 os_win/tests/{ => unit}/test_utils.py                           | 0
 os_win/tests/{ => unit}/test_utilsfactory.py                    | 2 +-
 os_win/tests/{utils/compute => unit/utils}/__init__.py          | 0
 os_win/tests/{utils/dns => unit/utils/compute}/__init__.py      | 0
 os_win/tests/{ => unit}/utils/compute/test_clusapi_utils.py     | 2 +-
 os_win/tests/{ => unit}/utils/compute/test_clusterutils.py      | 2 +-
 .../tests/{ => unit}/utils/compute/test_livemigrationutils.py   | 2 +-
 os_win/tests/{ => unit}/utils/compute/test_migrationutils.py    | 2 +-
 os_win/tests/{ => unit}/utils/compute/test_rdpconsoleutils.py   | 2 +-
 os_win/tests/{ => unit}/utils/compute/test_vmutils.py           | 2 +-
 os_win/tests/{ => unit}/utils/compute/test_vmutils10.py         | 2 +-
 os_win/tests/{utils/io => unit/utils/dns}/__init__.py           | 0
 os_win/tests/{ => unit}/utils/dns/test_dnsutils.py              | 2 +-
 os_win/tests/{utils/metrics => unit/utils/io}/__init__.py       | 0
 os_win/tests/{ => unit}/utils/io/test_ioutils.py                | 0
 os_win/tests/{ => unit}/utils/io/test_namedpipe.py              | 0
 os_win/tests/{utils/network => unit/utils/metrics}/__init__.py  | 0
 os_win/tests/{ => unit}/utils/metrics/test_metricsutils.py      | 2 +-
 os_win/tests/{utils/storage => unit/utils/network}/__init__.py  | 0
 os_win/tests/{ => unit}/utils/network/test_networkutils.py      | 2 +-
 os_win/tests/{ => unit}/utils/network/test_nvgreutils.py        | 2 +-
 .../{utils/storage/initiator => unit/utils/storage}/__init__.py | 0
 .../storage/target => unit/utils/storage/initiator}/__init__.py | 0
 .../{ => unit}/utils/storage/initiator/test_base_iscsi_utils.py | 2 +-
 .../tests/{ => unit}/utils/storage/initiator/test_fc_utils.py   | 0
 .../{ => unit}/utils/storage/initiator/test_iscsi_cli_utils.py  | 0
 .../{ => unit}/utils/storage/initiator/test_iscsi_struct.py     | 2 +-
 .../{ => unit}/utils/storage/initiator/test_iscsi_utils.py      | 2 +-
 .../{ => unit}/utils/storage/initiator/test_iscsi_wmi_utils.py  | 2 +-
 .../utils/storage/initiator/test_iscsidsc_structures.py         | 2 +-
 .../storage/virtdisk => unit/utils/storage/target}/__init__.py  | 0
 .../{ => unit}/utils/storage/target/test_iscsi_target_utils.py  | 2 +-
 os_win/tests/{ => unit}/utils/storage/test_diskutils.py         | 2 +-
 os_win/tests/{ => unit}/utils/storage/test_smbutils.py          | 2 +-
 os_win/tests/unit/utils/storage/virtdisk/__init__.py            | 0
 os_win/tests/{ => unit}/utils/storage/virtdisk/test_vhdutils.py | 0
 os_win/tests/{ => unit}/utils/test_aclutils.py                  | 2 +-
 os_win/tests/{ => unit}/utils/test_baseutils.py                 | 2 +-
 os_win/tests/{ => unit}/utils/test_hostutils.py                 | 2 +-
 os_win/tests/{ => unit}/utils/test_hostutils10.py               | 2 +-
 os_win/tests/{ => unit}/utils/test_jobutils.py                  | 2 +-
 os_win/tests/{ => unit}/utils/test_pathutils.py                 | 2 +-
 os_win/tests/{ => unit}/utils/test_win32utils.py                | 0
 os_win/tests/{ => unit}/utils/test_wqlutils.py                  | 2 +-
 47 files changed, 28 insertions(+), 28 deletions(-)
 rename os_win/tests/{utils => unit}/__init__.py (100%)
 rename os_win/tests/{ => unit}/test_base.py (100%)
 rename os_win/tests/{ => unit}/test_utils.py (100%)
 rename os_win/tests/{ => unit}/test_utilsfactory.py (99%)
 rename os_win/tests/{utils/compute => unit/utils}/__init__.py (100%)
 rename os_win/tests/{utils/dns => unit/utils/compute}/__init__.py (100%)
 rename os_win/tests/{ => unit}/utils/compute/test_clusapi_utils.py (99%)
 rename os_win/tests/{ => unit}/utils/compute/test_clusterutils.py (99%)
 rename os_win/tests/{ => unit}/utils/compute/test_livemigrationutils.py (99%)
 rename os_win/tests/{ => unit}/utils/compute/test_migrationutils.py (97%)
 rename os_win/tests/{ => unit}/utils/compute/test_rdpconsoleutils.py (97%)
 rename os_win/tests/{ => unit}/utils/compute/test_vmutils.py (99%)
 rename os_win/tests/{ => unit}/utils/compute/test_vmutils10.py (99%)
 rename os_win/tests/{utils/io => unit/utils/dns}/__init__.py (100%)
 rename os_win/tests/{ => unit}/utils/dns/test_dnsutils.py (99%)
 rename os_win/tests/{utils/metrics => unit/utils/io}/__init__.py (100%)
 rename os_win/tests/{ => unit}/utils/io/test_ioutils.py (100%)
 rename os_win/tests/{ => unit}/utils/io/test_namedpipe.py (100%)
 rename os_win/tests/{utils/network => unit/utils/metrics}/__init__.py (100%)
 rename os_win/tests/{ => unit}/utils/metrics/test_metricsutils.py (99%)
 rename os_win/tests/{utils/storage => unit/utils/network}/__init__.py (100%)
 rename os_win/tests/{ => unit}/utils/network/test_networkutils.py (99%)
 rename os_win/tests/{ => unit}/utils/network/test_nvgreutils.py (99%)
 rename os_win/tests/{utils/storage/initiator => unit/utils/storage}/__init__.py (100%)
 rename os_win/tests/{utils/storage/target => unit/utils/storage/initiator}/__init__.py (100%)
 rename os_win/tests/{ => unit}/utils/storage/initiator/test_base_iscsi_utils.py (99%)
 rename os_win/tests/{ => unit}/utils/storage/initiator/test_fc_utils.py (100%)
 rename os_win/tests/{ => unit}/utils/storage/initiator/test_iscsi_cli_utils.py (100%)
 rename os_win/tests/{ => unit}/utils/storage/initiator/test_iscsi_struct.py (98%)
 rename os_win/tests/{ => unit}/utils/storage/initiator/test_iscsi_utils.py (99%)
 rename os_win/tests/{ => unit}/utils/storage/initiator/test_iscsi_wmi_utils.py (99%)
 rename os_win/tests/{ => unit}/utils/storage/initiator/test_iscsidsc_structures.py (98%)
 rename os_win/tests/{utils/storage/virtdisk => unit/utils/storage/target}/__init__.py (100%)
 rename os_win/tests/{ => unit}/utils/storage/target/test_iscsi_target_utils.py (99%)
 rename os_win/tests/{ => unit}/utils/storage/test_diskutils.py (99%)
 rename os_win/tests/{ => unit}/utils/storage/test_smbutils.py (99%)
 create mode 100644 os_win/tests/unit/utils/storage/virtdisk/__init__.py
 rename os_win/tests/{ => unit}/utils/storage/virtdisk/test_vhdutils.py (100%)
 rename os_win/tests/{ => unit}/utils/test_aclutils.py (99%)
 rename os_win/tests/{ => unit}/utils/test_baseutils.py (99%)
 rename os_win/tests/{ => unit}/utils/test_hostutils.py (99%)
 rename os_win/tests/{ => unit}/utils/test_hostutils10.py (98%)
 rename os_win/tests/{ => unit}/utils/test_jobutils.py (99%)
 rename os_win/tests/{ => unit}/utils/test_pathutils.py (99%)
 rename os_win/tests/{ => unit}/utils/test_win32utils.py (100%)
 rename os_win/tests/{ => unit}/utils/test_wqlutils.py (98%)

diff --git a/README.rst b/README.rst
index be7cfd2..1ca104c 100644
--- a/README.rst
+++ b/README.rst
@@ -48,7 +48,7 @@ You can run the unit tests with the following command.
 
 ::
 
-    C:\os_win> nosetests os_win\tests
+    C:\os_win> nosetests os_win\tests\unit
 
 
 How to contribute
diff --git a/os_win/tests/utils/__init__.py b/os_win/tests/unit/__init__.py
similarity index 100%
rename from os_win/tests/utils/__init__.py
rename to os_win/tests/unit/__init__.py
diff --git a/os_win/tests/test_base.py b/os_win/tests/unit/test_base.py
similarity index 100%
rename from os_win/tests/test_base.py
rename to os_win/tests/unit/test_base.py
diff --git a/os_win/tests/test_utils.py b/os_win/tests/unit/test_utils.py
similarity index 100%
rename from os_win/tests/test_utils.py
rename to os_win/tests/unit/test_utils.py
diff --git a/os_win/tests/test_utilsfactory.py b/os_win/tests/unit/test_utilsfactory.py
similarity index 99%
rename from os_win/tests/test_utilsfactory.py
rename to os_win/tests/unit/test_utilsfactory.py
index 351e89a..a5de941 100644
--- a/os_win/tests/test_utilsfactory.py
+++ b/os_win/tests/unit/test_utilsfactory.py
@@ -21,7 +21,7 @@ import mock
 from oslo_config import cfg
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.compute import clusterutils
 from os_win.utils.compute import livemigrationutils
 from os_win.utils.compute import migrationutils
diff --git a/os_win/tests/utils/compute/__init__.py b/os_win/tests/unit/utils/__init__.py
similarity index 100%
rename from os_win/tests/utils/compute/__init__.py
rename to os_win/tests/unit/utils/__init__.py
diff --git a/os_win/tests/utils/dns/__init__.py b/os_win/tests/unit/utils/compute/__init__.py
similarity index 100%
rename from os_win/tests/utils/dns/__init__.py
rename to os_win/tests/unit/utils/compute/__init__.py
diff --git a/os_win/tests/utils/compute/test_clusapi_utils.py b/os_win/tests/unit/utils/compute/test_clusapi_utils.py
similarity index 99%
rename from os_win/tests/utils/compute/test_clusapi_utils.py
rename to os_win/tests/unit/utils/compute/test_clusapi_utils.py
index da9d7d6..c990380 100644
--- a/os_win/tests/utils/compute/test_clusapi_utils.py
+++ b/os_win/tests/unit/utils/compute/test_clusapi_utils.py
@@ -20,7 +20,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.compute import _clusapi_utils
 
 
diff --git a/os_win/tests/utils/compute/test_clusterutils.py b/os_win/tests/unit/utils/compute/test_clusterutils.py
similarity index 99%
rename from os_win/tests/utils/compute/test_clusterutils.py
rename to os_win/tests/unit/utils/compute/test_clusterutils.py
index aac3ecf..4294395 100644
--- a/os_win/tests/utils/compute/test_clusterutils.py
+++ b/os_win/tests/unit/utils/compute/test_clusterutils.py
@@ -18,7 +18,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.compute import _clusapi_utils
 from os_win.utils.compute import clusterutils
 
diff --git a/os_win/tests/utils/compute/test_livemigrationutils.py b/os_win/tests/unit/utils/compute/test_livemigrationutils.py
similarity index 99%
rename from os_win/tests/utils/compute/test_livemigrationutils.py
rename to os_win/tests/unit/utils/compute/test_livemigrationutils.py
index 55c7cfe..6bae682 100644
--- a/os_win/tests/utils/compute/test_livemigrationutils.py
+++ b/os_win/tests/unit/utils/compute/test_livemigrationutils.py
@@ -19,7 +19,7 @@ import mock
 import platform
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _wqlutils
 from os_win.utils.compute import livemigrationutils
 from os_win.utils.compute import vmutils
diff --git a/os_win/tests/utils/compute/test_migrationutils.py b/os_win/tests/unit/utils/compute/test_migrationutils.py
similarity index 97%
rename from os_win/tests/utils/compute/test_migrationutils.py
rename to os_win/tests/unit/utils/compute/test_migrationutils.py
index 0a9ad89..dbad430 100644
--- a/os_win/tests/utils/compute/test_migrationutils.py
+++ b/os_win/tests/unit/utils/compute/test_migrationutils.py
@@ -19,7 +19,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.compute import migrationutils
 
 
diff --git a/os_win/tests/utils/compute/test_rdpconsoleutils.py b/os_win/tests/unit/utils/compute/test_rdpconsoleutils.py
similarity index 97%
rename from os_win/tests/utils/compute/test_rdpconsoleutils.py
rename to os_win/tests/unit/utils/compute/test_rdpconsoleutils.py
index 54471a9..f281d13 100644
--- a/os_win/tests/utils/compute/test_rdpconsoleutils.py
+++ b/os_win/tests/unit/utils/compute/test_rdpconsoleutils.py
@@ -14,7 +14,7 @@
 
 import mock
 
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.compute import rdpconsoleutils
 
 
diff --git a/os_win/tests/utils/compute/test_vmutils.py b/os_win/tests/unit/utils/compute/test_vmutils.py
similarity index 99%
rename from os_win/tests/utils/compute/test_vmutils.py
rename to os_win/tests/unit/utils/compute/test_vmutils.py
index 201908b..eca6728 100644
--- a/os_win/tests/utils/compute/test_vmutils.py
+++ b/os_win/tests/unit/utils/compute/test_vmutils.py
@@ -20,7 +20,7 @@ from six.moves import range  # noqa
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _wqlutils
 from os_win.utils.compute import vmutils
 
diff --git a/os_win/tests/utils/compute/test_vmutils10.py b/os_win/tests/unit/utils/compute/test_vmutils10.py
similarity index 99%
rename from os_win/tests/utils/compute/test_vmutils10.py
rename to os_win/tests/unit/utils/compute/test_vmutils10.py
index 042abd8..8d96bc8 100644
--- a/os_win/tests/utils/compute/test_vmutils10.py
+++ b/os_win/tests/unit/utils/compute/test_vmutils10.py
@@ -16,7 +16,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _wqlutils
 from os_win.utils.compute import vmutils10
 
diff --git a/os_win/tests/utils/io/__init__.py b/os_win/tests/unit/utils/dns/__init__.py
similarity index 100%
rename from os_win/tests/utils/io/__init__.py
rename to os_win/tests/unit/utils/dns/__init__.py
diff --git a/os_win/tests/utils/dns/test_dnsutils.py b/os_win/tests/unit/utils/dns/test_dnsutils.py
similarity index 99%
rename from os_win/tests/utils/dns/test_dnsutils.py
rename to os_win/tests/unit/utils/dns/test_dnsutils.py
index e6b4261..8b89308 100644
--- a/os_win/tests/utils/dns/test_dnsutils.py
+++ b/os_win/tests/unit/utils/dns/test_dnsutils.py
@@ -17,7 +17,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.dns import dnsutils
 
 
diff --git a/os_win/tests/utils/metrics/__init__.py b/os_win/tests/unit/utils/io/__init__.py
similarity index 100%
rename from os_win/tests/utils/metrics/__init__.py
rename to os_win/tests/unit/utils/io/__init__.py
diff --git a/os_win/tests/utils/io/test_ioutils.py b/os_win/tests/unit/utils/io/test_ioutils.py
similarity index 100%
rename from os_win/tests/utils/io/test_ioutils.py
rename to os_win/tests/unit/utils/io/test_ioutils.py
diff --git a/os_win/tests/utils/io/test_namedpipe.py b/os_win/tests/unit/utils/io/test_namedpipe.py
similarity index 100%
rename from os_win/tests/utils/io/test_namedpipe.py
rename to os_win/tests/unit/utils/io/test_namedpipe.py
diff --git a/os_win/tests/utils/network/__init__.py b/os_win/tests/unit/utils/metrics/__init__.py
similarity index 100%
rename from os_win/tests/utils/network/__init__.py
rename to os_win/tests/unit/utils/metrics/__init__.py
diff --git a/os_win/tests/utils/metrics/test_metricsutils.py b/os_win/tests/unit/utils/metrics/test_metricsutils.py
similarity index 99%
rename from os_win/tests/utils/metrics/test_metricsutils.py
rename to os_win/tests/unit/utils/metrics/test_metricsutils.py
index 6268702..62c33fa 100644
--- a/os_win/tests/utils/metrics/test_metricsutils.py
+++ b/os_win/tests/unit/utils/metrics/test_metricsutils.py
@@ -16,7 +16,7 @@
 import mock
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _wqlutils
 from os_win.utils.metrics import metricsutils
 
diff --git a/os_win/tests/utils/storage/__init__.py b/os_win/tests/unit/utils/network/__init__.py
similarity index 100%
rename from os_win/tests/utils/storage/__init__.py
rename to os_win/tests/unit/utils/network/__init__.py
diff --git a/os_win/tests/utils/network/test_networkutils.py b/os_win/tests/unit/utils/network/test_networkutils.py
similarity index 99%
rename from os_win/tests/utils/network/test_networkutils.py
rename to os_win/tests/unit/utils/network/test_networkutils.py
index 1add2b6..ab101a1 100644
--- a/os_win/tests/utils/network/test_networkutils.py
+++ b/os_win/tests/unit/utils/network/test_networkutils.py
@@ -15,7 +15,7 @@
 import mock
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _wqlutils
 from os_win.utils.network import networkutils
 
diff --git a/os_win/tests/utils/network/test_nvgreutils.py b/os_win/tests/unit/utils/network/test_nvgreutils.py
similarity index 99%
rename from os_win/tests/utils/network/test_nvgreutils.py
rename to os_win/tests/unit/utils/network/test_nvgreutils.py
index 45d55b7..6088659 100644
--- a/os_win/tests/utils/network/test_nvgreutils.py
+++ b/os_win/tests/unit/utils/network/test_nvgreutils.py
@@ -21,7 +21,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.network import nvgreutils
 
 
diff --git a/os_win/tests/utils/storage/initiator/__init__.py b/os_win/tests/unit/utils/storage/__init__.py
similarity index 100%
rename from os_win/tests/utils/storage/initiator/__init__.py
rename to os_win/tests/unit/utils/storage/__init__.py
diff --git a/os_win/tests/utils/storage/target/__init__.py b/os_win/tests/unit/utils/storage/initiator/__init__.py
similarity index 100%
rename from os_win/tests/utils/storage/target/__init__.py
rename to os_win/tests/unit/utils/storage/initiator/__init__.py
diff --git a/os_win/tests/utils/storage/initiator/test_base_iscsi_utils.py b/os_win/tests/unit/utils/storage/initiator/test_base_iscsi_utils.py
similarity index 99%
rename from os_win/tests/utils/storage/initiator/test_base_iscsi_utils.py
rename to os_win/tests/unit/utils/storage/initiator/test_base_iscsi_utils.py
index a741e42..33199b5 100644
--- a/os_win/tests/utils/storage/initiator/test_base_iscsi_utils.py
+++ b/os_win/tests/unit/utils/storage/initiator/test_base_iscsi_utils.py
@@ -16,7 +16,7 @@
 
 import mock
 
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage.initiator import base_iscsi_utils
 
 
diff --git a/os_win/tests/utils/storage/initiator/test_fc_utils.py b/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py
similarity index 100%
rename from os_win/tests/utils/storage/initiator/test_fc_utils.py
rename to os_win/tests/unit/utils/storage/initiator/test_fc_utils.py
diff --git a/os_win/tests/utils/storage/initiator/test_iscsi_cli_utils.py b/os_win/tests/unit/utils/storage/initiator/test_iscsi_cli_utils.py
similarity index 100%
rename from os_win/tests/utils/storage/initiator/test_iscsi_cli_utils.py
rename to os_win/tests/unit/utils/storage/initiator/test_iscsi_cli_utils.py
diff --git a/os_win/tests/utils/storage/initiator/test_iscsi_struct.py b/os_win/tests/unit/utils/storage/initiator/test_iscsi_struct.py
similarity index 98%
rename from os_win/tests/utils/storage/initiator/test_iscsi_struct.py
rename to os_win/tests/unit/utils/storage/initiator/test_iscsi_struct.py
index f6b8c8f..a1dc6dd 100644
--- a/os_win/tests/utils/storage/initiator/test_iscsi_struct.py
+++ b/os_win/tests/unit/utils/storage/initiator/test_iscsi_struct.py
@@ -19,7 +19,7 @@ import ctypes
 import six
 
 from os_win import constants
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage.initiator import iscsidsc_structures as iscsi_struct
 
 
diff --git a/os_win/tests/utils/storage/initiator/test_iscsi_utils.py b/os_win/tests/unit/utils/storage/initiator/test_iscsi_utils.py
similarity index 99%
rename from os_win/tests/utils/storage/initiator/test_iscsi_utils.py
rename to os_win/tests/unit/utils/storage/initiator/test_iscsi_utils.py
index eb7cb5d..490b0c5 100644
--- a/os_win/tests/utils/storage/initiator/test_iscsi_utils.py
+++ b/os_win/tests/unit/utils/storage/initiator/test_iscsi_utils.py
@@ -23,7 +23,7 @@ import mock
 from os_win import _utils
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage.initiator import iscsi_utils
 from os_win.utils.storage.initiator import iscsidsc_structures as iscsi_struct
 from os_win.utils.storage.initiator import iscsierr
diff --git a/os_win/tests/utils/storage/initiator/test_iscsi_wmi_utils.py b/os_win/tests/unit/utils/storage/initiator/test_iscsi_wmi_utils.py
similarity index 99%
rename from os_win/tests/utils/storage/initiator/test_iscsi_wmi_utils.py
rename to os_win/tests/unit/utils/storage/initiator/test_iscsi_wmi_utils.py
index ba80830..cfd7981 100644
--- a/os_win/tests/utils/storage/initiator/test_iscsi_wmi_utils.py
+++ b/os_win/tests/unit/utils/storage/initiator/test_iscsi_wmi_utils.py
@@ -15,7 +15,7 @@
 import mock
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage.initiator import iscsi_wmi_utils
 
 
diff --git a/os_win/tests/utils/storage/initiator/test_iscsidsc_structures.py b/os_win/tests/unit/utils/storage/initiator/test_iscsidsc_structures.py
similarity index 98%
rename from os_win/tests/utils/storage/initiator/test_iscsidsc_structures.py
rename to os_win/tests/unit/utils/storage/initiator/test_iscsidsc_structures.py
index f6b8c8f..a1dc6dd 100644
--- a/os_win/tests/utils/storage/initiator/test_iscsidsc_structures.py
+++ b/os_win/tests/unit/utils/storage/initiator/test_iscsidsc_structures.py
@@ -19,7 +19,7 @@ import ctypes
 import six
 
 from os_win import constants
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage.initiator import iscsidsc_structures as iscsi_struct
 
 
diff --git a/os_win/tests/utils/storage/virtdisk/__init__.py b/os_win/tests/unit/utils/storage/target/__init__.py
similarity index 100%
rename from os_win/tests/utils/storage/virtdisk/__init__.py
rename to os_win/tests/unit/utils/storage/target/__init__.py
diff --git a/os_win/tests/utils/storage/target/test_iscsi_target_utils.py b/os_win/tests/unit/utils/storage/target/test_iscsi_target_utils.py
similarity index 99%
rename from os_win/tests/utils/storage/target/test_iscsi_target_utils.py
rename to os_win/tests/unit/utils/storage/target/test_iscsi_target_utils.py
index 273aea3..37bb24b 100644
--- a/os_win/tests/utils/storage/target/test_iscsi_target_utils.py
+++ b/os_win/tests/unit/utils/storage/target/test_iscsi_target_utils.py
@@ -17,7 +17,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage.target import iscsi_target_utils as tg_utils
 
 
diff --git a/os_win/tests/utils/storage/test_diskutils.py b/os_win/tests/unit/utils/storage/test_diskutils.py
similarity index 99%
rename from os_win/tests/utils/storage/test_diskutils.py
rename to os_win/tests/unit/utils/storage/test_diskutils.py
index adcadbf..d886050 100644
--- a/os_win/tests/utils/storage/test_diskutils.py
+++ b/os_win/tests/unit/utils/storage/test_diskutils.py
@@ -17,7 +17,7 @@ import ddt
 import mock
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage import diskutils
 
 
diff --git a/os_win/tests/utils/storage/test_smbutils.py b/os_win/tests/unit/utils/storage/test_smbutils.py
similarity index 99%
rename from os_win/tests/utils/storage/test_smbutils.py
rename to os_win/tests/unit/utils/storage/test_smbutils.py
index e07e267..f28b939 100644
--- a/os_win/tests/utils/storage/test_smbutils.py
+++ b/os_win/tests/unit/utils/storage/test_smbutils.py
@@ -17,7 +17,7 @@ import ddt
 import mock
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils.storage import smbutils
 
 
diff --git a/os_win/tests/unit/utils/storage/virtdisk/__init__.py b/os_win/tests/unit/utils/storage/virtdisk/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/os_win/tests/utils/storage/virtdisk/test_vhdutils.py b/os_win/tests/unit/utils/storage/virtdisk/test_vhdutils.py
similarity index 100%
rename from os_win/tests/utils/storage/virtdisk/test_vhdutils.py
rename to os_win/tests/unit/utils/storage/virtdisk/test_vhdutils.py
diff --git a/os_win/tests/utils/test_aclutils.py b/os_win/tests/unit/utils/test_aclutils.py
similarity index 99%
rename from os_win/tests/utils/test_aclutils.py
rename to os_win/tests/unit/utils/test_aclutils.py
index f93aa41..2962a52 100644
--- a/os_win/tests/utils/test_aclutils.py
+++ b/os_win/tests/unit/utils/test_aclutils.py
@@ -16,7 +16,7 @@
 import ddt
 import mock
 
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _acl_utils
 
 
diff --git a/os_win/tests/utils/test_baseutils.py b/os_win/tests/unit/utils/test_baseutils.py
similarity index 99%
rename from os_win/tests/utils/test_baseutils.py
rename to os_win/tests/unit/utils/test_baseutils.py
index 034234d..c518275 100644
--- a/os_win/tests/utils/test_baseutils.py
+++ b/os_win/tests/unit/utils/test_baseutils.py
@@ -14,7 +14,7 @@
 
 import mock
 
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import baseutils
 
 
diff --git a/os_win/tests/utils/test_hostutils.py b/os_win/tests/unit/utils/test_hostutils.py
similarity index 99%
rename from os_win/tests/utils/test_hostutils.py
rename to os_win/tests/unit/utils/test_hostutils.py
index 7095ab1..30f1960 100644
--- a/os_win/tests/utils/test_hostutils.py
+++ b/os_win/tests/unit/utils/test_hostutils.py
@@ -16,7 +16,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import hostutils
 
 
diff --git a/os_win/tests/utils/test_hostutils10.py b/os_win/tests/unit/utils/test_hostutils10.py
similarity index 98%
rename from os_win/tests/utils/test_hostutils10.py
rename to os_win/tests/unit/utils/test_hostutils10.py
index 79caace..152131a 100644
--- a/os_win/tests/utils/test_hostutils10.py
+++ b/os_win/tests/unit/utils/test_hostutils10.py
@@ -16,7 +16,7 @@
 import mock
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import hostutils10
 
 
diff --git a/os_win/tests/utils/test_jobutils.py b/os_win/tests/unit/utils/test_jobutils.py
similarity index 99%
rename from os_win/tests/utils/test_jobutils.py
rename to os_win/tests/unit/utils/test_jobutils.py
index b7a31c8..656506d 100644
--- a/os_win/tests/utils/test_jobutils.py
+++ b/os_win/tests/unit/utils/test_jobutils.py
@@ -17,7 +17,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import jobutils
 
 
diff --git a/os_win/tests/utils/test_pathutils.py b/os_win/tests/unit/utils/test_pathutils.py
similarity index 99%
rename from os_win/tests/utils/test_pathutils.py
rename to os_win/tests/unit/utils/test_pathutils.py
index aa5cf1b..8d64e75 100644
--- a/os_win/tests/utils/test_pathutils.py
+++ b/os_win/tests/unit/utils/test_pathutils.py
@@ -20,7 +20,7 @@ import mock
 
 from os_win import constants
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _acl_utils
 from os_win.utils import pathutils
 
diff --git a/os_win/tests/utils/test_win32utils.py b/os_win/tests/unit/utils/test_win32utils.py
similarity index 100%
rename from os_win/tests/utils/test_win32utils.py
rename to os_win/tests/unit/utils/test_win32utils.py
diff --git a/os_win/tests/utils/test_wqlutils.py b/os_win/tests/unit/utils/test_wqlutils.py
similarity index 98%
rename from os_win/tests/utils/test_wqlutils.py
rename to os_win/tests/unit/utils/test_wqlutils.py
index 38266cb..49b1237 100644
--- a/os_win/tests/utils/test_wqlutils.py
+++ b/os_win/tests/unit/utils/test_wqlutils.py
@@ -16,7 +16,7 @@
 import mock
 
 from os_win import exceptions
-from os_win.tests import test_base
+from os_win.tests.unit import test_base
 from os_win.utils import _wqlutils