From 3395ede89dd0f76d867444411d38a9f17cced02e Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Wed, 18 Nov 2015 14:27:54 +0500
Subject: [PATCH] rename tests package to rostest

---
 tests/integration/{rancherostest => rostest}/__init__.py      | 0
 tests/integration/{rancherostest => rostest}/conftest.py      | 0
 .../integration/{rancherostest => rostest}/test_00_system.py  | 2 +-
 .../{rancherostest => rostest}/test_01_cloud_config.py        | 2 +-
 .../{rancherostest => rostest}/test_02_custom_kernel.py       | 2 +-
 .../test_03_docker_in_persistent_console.py                   | 2 +-
 .../{rancherostest => rostest}/test_04_ros_install.py         | 2 +-
 .../test_05_custom_docker_in_persistent_console.py            | 2 +-
 tests/integration/{rancherostest => rostest}/test_sample.py   | 0
 tests/integration/{rancherostest => rostest}/util.py          | 0
 tests/integration/setup.py                                    | 2 +-
 tests/integration/tox.ini                                     | 4 ++--
 12 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/integration/{rancherostest => rostest}/__init__.py (100%)
 rename tests/integration/{rancherostest => rostest}/conftest.py (100%)
 rename tests/integration/{rancherostest => rostest}/test_00_system.py (97%)
 rename tests/integration/{rancherostest => rostest}/test_01_cloud_config.py (98%)
 rename tests/integration/{rancherostest => rostest}/test_02_custom_kernel.py (97%)
 rename tests/integration/{rancherostest => rostest}/test_03_docker_in_persistent_console.py (96%)
 rename tests/integration/{rancherostest => rostest}/test_04_ros_install.py (96%)
 rename tests/integration/{rancherostest => rostest}/test_05_custom_docker_in_persistent_console.py (97%)
 rename tests/integration/{rancherostest => rostest}/test_sample.py (100%)
 rename tests/integration/{rancherostest => rostest}/util.py (100%)

diff --git a/tests/integration/rancherostest/__init__.py b/tests/integration/rostest/__init__.py
similarity index 100%
rename from tests/integration/rancherostest/__init__.py
rename to tests/integration/rostest/__init__.py
diff --git a/tests/integration/rancherostest/conftest.py b/tests/integration/rostest/conftest.py
similarity index 100%
rename from tests/integration/rancherostest/conftest.py
rename to tests/integration/rostest/conftest.py
diff --git a/tests/integration/rancherostest/test_00_system.py b/tests/integration/rostest/test_00_system.py
similarity index 97%
rename from tests/integration/rancherostest/test_00_system.py
rename to tests/integration/rostest/test_00_system.py
index 5d32e612..cc2edf53 100644
--- a/tests/integration/rancherostest/test_00_system.py
+++ b/tests/integration/rostest/test_00_system.py
@@ -2,7 +2,7 @@ from __future__ import print_function
 import itertools as it
 import pytest
 import subprocess
-import rancherostest.util as u
+import rostest.util as u
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/rancherostest/test_01_cloud_config.py b/tests/integration/rostest/test_01_cloud_config.py
similarity index 98%
rename from tests/integration/rancherostest/test_01_cloud_config.py
rename to tests/integration/rostest/test_01_cloud_config.py
index 58186de6..3b12815d 100644
--- a/tests/integration/rancherostest/test_01_cloud_config.py
+++ b/tests/integration/rostest/test_01_cloud_config.py
@@ -1,5 +1,5 @@
 import pytest
-import rancherostest.util as u
+import rostest.util as u
 import string
 import subprocess
 import yaml
diff --git a/tests/integration/rancherostest/test_02_custom_kernel.py b/tests/integration/rostest/test_02_custom_kernel.py
similarity index 97%
rename from tests/integration/rancherostest/test_02_custom_kernel.py
rename to tests/integration/rostest/test_02_custom_kernel.py
index 817064f0..1a61f582 100644
--- a/tests/integration/rancherostest/test_02_custom_kernel.py
+++ b/tests/integration/rostest/test_02_custom_kernel.py
@@ -2,7 +2,7 @@ from __future__ import print_function
 import itertools as it
 import pytest
 import subprocess
-import rancherostest.util as u
+import rostest.util as u
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/rancherostest/test_03_docker_in_persistent_console.py b/tests/integration/rostest/test_03_docker_in_persistent_console.py
similarity index 96%
rename from tests/integration/rancherostest/test_03_docker_in_persistent_console.py
rename to tests/integration/rostest/test_03_docker_in_persistent_console.py
index c91d4940..5243a9ca 100644
--- a/tests/integration/rancherostest/test_03_docker_in_persistent_console.py
+++ b/tests/integration/rostest/test_03_docker_in_persistent_console.py
@@ -1,5 +1,5 @@
 import pytest
-import rancherostest.util as u
+import rostest.util as u
 import subprocess
 
 
diff --git a/tests/integration/rancherostest/test_04_ros_install.py b/tests/integration/rostest/test_04_ros_install.py
similarity index 96%
rename from tests/integration/rancherostest/test_04_ros_install.py
rename to tests/integration/rostest/test_04_ros_install.py
index 3b204767..a79280ba 100644
--- a/tests/integration/rancherostest/test_04_ros_install.py
+++ b/tests/integration/rostest/test_04_ros_install.py
@@ -1,5 +1,5 @@
 import pytest
-import rancherostest.util as u
+import rostest.util as u
 import subprocess
 
 
diff --git a/tests/integration/rancherostest/test_05_custom_docker_in_persistent_console.py b/tests/integration/rostest/test_05_custom_docker_in_persistent_console.py
similarity index 97%
rename from tests/integration/rancherostest/test_05_custom_docker_in_persistent_console.py
rename to tests/integration/rostest/test_05_custom_docker_in_persistent_console.py
index 1e763a81..a5575110 100644
--- a/tests/integration/rancherostest/test_05_custom_docker_in_persistent_console.py
+++ b/tests/integration/rostest/test_05_custom_docker_in_persistent_console.py
@@ -1,5 +1,5 @@
 import pytest
-import rancherostest.util as u
+import rostest.util as u
 import subprocess
 
 
diff --git a/tests/integration/rancherostest/test_sample.py b/tests/integration/rostest/test_sample.py
similarity index 100%
rename from tests/integration/rancherostest/test_sample.py
rename to tests/integration/rostest/test_sample.py
diff --git a/tests/integration/rancherostest/util.py b/tests/integration/rostest/util.py
similarity index 100%
rename from tests/integration/rancherostest/util.py
rename to tests/integration/rostest/util.py
diff --git a/tests/integration/setup.py b/tests/integration/setup.py
index fba2685f..2d48f65b 100644
--- a/tests/integration/setup.py
+++ b/tests/integration/setup.py
@@ -4,7 +4,7 @@ setup(
     name='RancherOSIntegrationTests',
     version='0.1',
     packages=[
-        'rancherostest'
+        'rostest'
     ],
     license='ASL 2.0',
     long_description=open('README.txt').read(),
diff --git a/tests/integration/tox.ini b/tests/integration/tox.ini
index 28f44931..e16eedf0 100644
--- a/tests/integration/tox.ini
+++ b/tests/integration/tox.ini
@@ -4,11 +4,11 @@ skipsdist=True
 
 [testenv]
 deps=-rrequirements.txt
-commands=py.test -s --durations=20 rancherostest {posargs}
+commands=py.test -s --durations=20 rostest {posargs}
 
 [testenv:flake8]
 deps=flake8
-commands=flake8 rancherostest
+commands=flake8 rostest
 
 [flake8]
 max-line-length = 120