summaryrefslogtreecommitdiffstats
path: root/pytest.ini
diff options
context:
space:
mode:
authorAlanCoding <arominge@redhat.com>2017-04-26 16:48:24 +0200
committerAlanCoding <arominge@redhat.com>2017-05-01 20:37:42 +0200
commit8e6020436c8fcd1654e38593c5e05defed529ab7 (patch)
tree07b15b1c37b6f4fc215d8fa91fa511f1f0cb3d0e /pytest.ini
parentpurge of inventory file syntax testing (diff)
downloadawx-8e6020436c8fcd1654e38593c5e05defed529ab7.tar.xz
awx-8e6020436c8fcd1654e38593c5e05defed529ab7.zip
modularization of inventory_import command
This separates file parsing logic that was mixed in with other important code inside of the inventory import command. The logic around MemObject data structures was moved to utils, and the file parsing was moved to a legacy module. As of this commit, that module can operate within the Tower environment but it will be removed. Also refactor the loggers to fix old bug and work inside of the different contexts - the Loader classes, mem objects, and hopefully the inventory modules eventually.
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini
index 2993b1f577..4884ec4897 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -8,3 +8,5 @@ markers =
ac: access control test
license_feature: ensure license features are accessible or not depending on license
mongo_db: drop mongodb test database before test runs
+ survey: tests related to survey feature
+ inventory_import: tests of code used by inventory import command