CORD-1939 support for nose2 modify test cases to be compliant with automation Change-Id: Iddb3803b71d027010e4df00efd2ed8ba671efbd7

commit: b641f9060eb912470a284bfd04dd955b031af708 [log] [tgz]
author: Scott Baker <smbaker@gmail.com> Tue Oct 24 10:13:34 2017 -0700
committer: Scott Baker <scottb@onlab.us> Wed Nov 01 09:45:41 2017 -0700
tree: 8bb30c7b417e7185e16549c8eae4a10eb8b2d2d8
parent: df383adc0b1e7756ffaf817496c8ddb2f35ad1f3 [diff]
diff --git a/lib/xos-genx/tests/__init__.py b/lib/xos-genx/xos-genx-tests/__init__.py
similarity index 100%
rename from lib/xos-genx/tests/__init__.py
rename to lib/xos-genx/xos-genx-tests/__init__.py


diff --git a/lib/xos-genx/tests/attics/xosmodel_bottom.py b/lib/xos-genx/xos-genx-tests/attics/xosmodel_bottom.py
similarity index 100%
rename from lib/xos-genx/tests/attics/xosmodel_bottom.py
rename to lib/xos-genx/xos-genx-tests/attics/xosmodel_bottom.py


diff --git a/lib/xos-genx/tests/attics/xosmodel_header.py b/lib/xos-genx/xos-genx-tests/attics/xosmodel_header.py
similarity index 100%
rename from lib/xos-genx/tests/attics/xosmodel_header.py
rename to lib/xos-genx/xos-genx-tests/attics/xosmodel_header.py


diff --git a/lib/xos-genx/tests/attics/xosmodel_model.py b/lib/xos-genx/xos-genx-tests/attics/xosmodel_model.py
similarity index 100%
rename from lib/xos-genx/tests/attics/xosmodel_model.py
rename to lib/xos-genx/xos-genx-tests/attics/xosmodel_model.py


diff --git a/lib/xos-genx/tests/attics/xosmodel_top.py b/lib/xos-genx/xos-genx-tests/attics/xosmodel_top.py
similarity index 100%
rename from lib/xos-genx/tests/attics/xosmodel_top.py
rename to lib/xos-genx/xos-genx-tests/attics/xosmodel_top.py


diff --git a/lib/xos-genx/tests/counts b/lib/xos-genx/xos-genx-tests/counts
similarity index 100%
rename from lib/xos-genx/tests/counts
rename to lib/xos-genx/xos-genx-tests/counts


diff --git a/lib/xos-genx/tests/django_generator_test.py b/lib/xos-genx/xos-genx-tests/django_generator_test.py
similarity index 100%
rename from lib/xos-genx/tests/django_generator_test.py
rename to lib/xos-genx/xos-genx-tests/django_generator_test.py


diff --git a/lib/xos-genx/tests/field_graph_test.py b/lib/xos-genx/xos-genx-tests/field_graph_test.py
similarity index 100%
rename from lib/xos-genx/tests/field_graph_test.py
rename to lib/xos-genx/xos-genx-tests/field_graph_test.py


diff --git a/lib/xos-genx/tests/general_security_test.py b/lib/xos-genx/xos-genx-tests/general_security_test.py
similarity index 100%
rename from lib/xos-genx/tests/general_security_test.py
rename to lib/xos-genx/xos-genx-tests/general_security_test.py


diff --git a/lib/xos-genx/tests/general_validation_test.py b/lib/xos-genx/xos-genx-tests/general_validation_test.py
similarity index 100%
rename from lib/xos-genx/tests/general_validation_test.py
rename to lib/xos-genx/xos-genx-tests/general_validation_test.py


diff --git a/lib/xos-genx/tests/graph_test.py b/lib/xos-genx/xos-genx-tests/graph_test.py
similarity index 100%
rename from lib/xos-genx/tests/graph_test.py
rename to lib/xos-genx/xos-genx-tests/graph_test.py


diff --git a/lib/xos-genx/tests/helpers.py b/lib/xos-genx/xos-genx-tests/helpers.py
similarity index 100%
rename from lib/xos-genx/tests/helpers.py
rename to lib/xos-genx/xos-genx-tests/helpers.py


diff --git a/lib/xos-genx/tests/optimize_test.py b/lib/xos-genx/xos-genx-tests/optimize_test.py
similarity index 100%
rename from lib/xos-genx/tests/optimize_test.py
rename to lib/xos-genx/xos-genx-tests/optimize_test.py


diff --git a/lib/xos-genx/tests/out/.gitignore b/lib/xos-genx/xos-genx-tests/out/.gitignore
similarity index 100%
rename from lib/xos-genx/tests/out/.gitignore
rename to lib/xos-genx/xos-genx-tests/out/.gitignore


diff --git a/lib/xos-genx/tests/package_test.py b/lib/xos-genx/xos-genx-tests/package_test.py
similarity index 100%
rename from lib/xos-genx/tests/package_test.py
rename to lib/xos-genx/xos-genx-tests/package_test.py


diff --git a/lib/xos-genx/tests/parse_test.py b/lib/xos-genx/xos-genx-tests/parse_test.py
similarity index 100%
rename from lib/xos-genx/tests/parse_test.py
rename to lib/xos-genx/xos-genx-tests/parse_test.py


diff --git a/lib/xos-genx/tests/policy_test.py b/lib/xos-genx/xos-genx-tests/policy_test.py
similarity index 100%
rename from lib/xos-genx/tests/policy_test.py
rename to lib/xos-genx/xos-genx-tests/policy_test.py


diff --git a/lib/xos-genx/tests/pure_proto_test.py b/lib/xos-genx/xos-genx-tests/pure_proto_test.py
similarity index 100%
rename from lib/xos-genx/tests/pure_proto_test.py
rename to lib/xos-genx/xos-genx-tests/pure_proto_test.py


diff --git a/lib/xos-genx/tests/rlinks_test.py b/lib/xos-genx/xos-genx-tests/rlinks_test.py
similarity index 100%
rename from lib/xos-genx/tests/rlinks_test.py
rename to lib/xos-genx/xos-genx-tests/rlinks_test.py


diff --git a/lib/xos-genx/tests/swagger_test.py b/lib/xos-genx/xos-genx-tests/swagger_test.py
similarity index 100%
rename from lib/xos-genx/tests/swagger_test.py
rename to lib/xos-genx/xos-genx-tests/swagger_test.py


diff --git a/lib/xos-genx/tests/target_test.py b/lib/xos-genx/xos-genx-tests/target_test.py
similarity index 100%
rename from lib/xos-genx/tests/target_test.py
rename to lib/xos-genx/xos-genx-tests/target_test.py


diff --git a/lib/xos-genx/tests/test_cli.py b/lib/xos-genx/xos-genx-tests/test_cli.py
similarity index 89%
rename from lib/xos-genx/tests/test_cli.py
rename to lib/xos-genx/xos-genx-tests/test_cli.py
index 89935bc..29098f1 100644
--- a/lib/xos-genx/tests/test_cli.py
+++ b/lib/xos-genx/xos-genx-tests/test_cli.py

@@ -32,9 +32,9 @@
         [XOS-GenX] The CLI entry point should correctly parse params
         """
         args = Args()
-        args.files = ['tests/xproto/test.xproto']
-        args.target = 'tests/xtarget/test.xtarget'
-        args.output = 'tests/out/dir/'
+        args.files = ['lib/xos-genx/xos-genx-tests/xproto/test.xproto']
+        args.target = 'lib/xos-genx/xos-genx-tests/xtarget/test.xtarget'
+        args.output = 'lib/xos-genx/xos-genx-tests/out/dir/'
         args.write_to_file = "target"
         args.dest_file = None
         args.dest_extension = None

diff --git a/lib/xos-genx/tests/test_generator.py b/lib/xos-genx/xos-genx-tests/test_generator.py
similarity index 98%
rename from lib/xos-genx/tests/test_generator.py
rename to lib/xos-genx/xos-genx-tests/test_generator.py
index 0e7e337..f59bbfd 100644
--- a/lib/xos-genx/tests/test_generator.py
+++ b/lib/xos-genx/xos-genx-tests/test_generator.py

@@ -45,6 +45,7 @@
     """
 
     def setUp(self):
+        os.chdir(os.path.join(os.path.abspath(os.path.dirname(os.path.realpath(__file__))), "..")) 
         filesToRemove = [f for f in os.listdir(OUTPUT_DIR)]
         for f in filesToRemove:
             if not f.startswith('.'):

diff --git a/lib/xos-genx/tests/tosca_test.py b/lib/xos-genx/xos-genx-tests/tosca_test.py
similarity index 100%
rename from lib/xos-genx/tests/tosca_test.py
rename to lib/xos-genx/xos-genx-tests/tosca_test.py


diff --git a/lib/xos-genx/tests/translator_test.py b/lib/xos-genx/xos-genx-tests/translator_test.py
similarity index 100%
rename from lib/xos-genx/tests/translator_test.py
rename to lib/xos-genx/xos-genx-tests/translator_test.py


diff --git a/lib/xos-genx/tests/xos_security_test.py b/lib/xos-genx/xos-genx-tests/xos_security_test.py
similarity index 100%
rename from lib/xos-genx/tests/xos_security_test.py
rename to lib/xos-genx/xos-genx-tests/xos_security_test.py


diff --git a/lib/xos-genx/tests/xos_validation_test.py b/lib/xos-genx/xos-genx-tests/xos_validation_test.py
similarity index 100%
rename from lib/xos-genx/tests/xos_validation_test.py
rename to lib/xos-genx/xos-genx-tests/xos_validation_test.py


diff --git a/lib/xos-genx/tests/xproto/base.xproto b/lib/xos-genx/xos-genx-tests/xproto/base.xproto
similarity index 100%
rename from lib/xos-genx/tests/xproto/base.xproto
rename to lib/xos-genx/xos-genx-tests/xproto/base.xproto


diff --git a/lib/xos-genx/tests/xproto/skip_django.xproto b/lib/xos-genx/xos-genx-tests/xproto/skip_django.xproto
similarity index 100%
rename from lib/xos-genx/tests/xproto/skip_django.xproto
rename to lib/xos-genx/xos-genx-tests/xproto/skip_django.xproto


diff --git a/lib/xos-genx/tests/xproto/test.xproto b/lib/xos-genx/xos-genx-tests/xproto/test.xproto
similarity index 100%
rename from lib/xos-genx/tests/xproto/test.xproto
rename to lib/xos-genx/xos-genx-tests/xproto/test.xproto


diff --git a/lib/xos-genx/tests/xproto/vrouterport.xproto b/lib/xos-genx/xos-genx-tests/xproto/vrouterport.xproto
similarity index 100%
rename from lib/xos-genx/tests/xproto/vrouterport.xproto
rename to lib/xos-genx/xos-genx-tests/xproto/vrouterport.xproto


diff --git a/lib/xos-genx/tests/xtarget/split.xtarget b/lib/xos-genx/xos-genx-tests/xtarget/split.xtarget
similarity index 100%
rename from lib/xos-genx/tests/xtarget/split.xtarget
rename to lib/xos-genx/xos-genx-tests/xtarget/split.xtarget


diff --git a/lib/xos-genx/tests/xtarget/test.xtarget b/lib/xos-genx/xos-genx-tests/xtarget/test.xtarget
similarity index 100%
rename from lib/xos-genx/tests/xtarget/test.xtarget
rename to lib/xos-genx/xos-genx-tests/xtarget/test.xtarget
commit	b641f9060eb912470a284bfd04dd955b031af708	[log] [tgz]
author	Scott Baker <smbaker@gmail.com>	Tue Oct 24 10:13:34 2017 -0700
committer	Scott Baker <scottb@onlab.us>	Wed Nov 01 09:45:41 2017 -0700
tree	8bb30c7b417e7185e16549c8eae4a10eb8b2d2d8
parent	df383adc0b1e7756ffaf817496c8ddb2f35ad1f3 [diff]