Skip to content

Commit

Permalink
Merge pull request #3366 from rplevka/import_tiers
Browse files Browse the repository at this point in the history 
part of a fix of #3291 - removing tier decorators for Import tests
  • Loading branch information
@omaciel
omaciel committed Mar 30, 2016
2 parents fdfe525 + 92e218c commit 7e12cd8
Showing 1 changed file with 1 addition and 29 deletions.
30 changes: 1 addition & 29 deletions tests/foreman/cli/test_import.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from robottelo.cli.template import Template
from robottelo.cli.user import User
from robottelo.config import settings
from robottelo.decorators import bz_bug_is_open, skip_if_bug_open, tier1
from robottelo.decorators import bz_bug_is_open, skip_if_bug_open
from robottelo.test import CLITestCase


Expand Down Expand Up @@ -501,7 +501,6 @@ def tearDownClass(cls):
ssh.command(u'rm -r {0}'.format(cls.default_dataset[0]))
super(TestImport, cls).tearDownClass()

@tier1
def test_positive_import_orgs_default(self):
"""Import all organizations from the default data set
(predefined source).
Expand All @@ -522,7 +521,6 @@ def test_positive_import_orgs_default(self):
Org.info({'name': org['organization']})
clean_transdata()

@tier1
def test_positive_import_orgs_manifests(self):
"""Import all organizations from the default data set
(predefined source) and upload manifests for each of them
Expand Down Expand Up @@ -554,7 +552,6 @@ def test_positive_import_orgs_manifests(self):
self.assertIn('SUCCESS', manifest_history)
clean_transdata()

@tier1
def test_negative_reimport_orgs_default(self):
"""Try to Import all organizations from the predefined source
and try to import them again
Expand All @@ -575,7 +572,6 @@ def test_negative_reimport_orgs_default(self):
self.assertEqual(orgs_before, Org.list())
clean_transdata()

@tier1
def test_positive_import_orgs_recovery(self):
"""Try to Import organizations with the same name to invoke
usage of a recovery strategy (rename, map, none)
Expand Down Expand Up @@ -625,7 +621,6 @@ def test_positive_import_orgs_recovery(self):
})
clean_transdata()

@tier1
def test_positive_merge_orgs(self):
"""Try to Import all organizations and their users from CSV
to a mapped organization.
Expand Down Expand Up @@ -663,7 +658,6 @@ def test_positive_merge_orgs(self):
self.assertTrue(all((user in logins for user in imp_users)))
clean_transdata()

@tier1
def test_positive_import_users_default(self):
"""Import all 3 users from the default data set (predefined
source).
Expand Down Expand Up @@ -693,7 +687,6 @@ def test_positive_import_users_default(self):
self.assertTrue(imp_users.issubset(logins))
clean_transdata()

@tier1
def test_negative_reimport_users_default(self):
"""Try to Import all users from the
predefined source and try to import them again
Expand Down Expand Up @@ -723,7 +716,6 @@ def test_negative_reimport_users_default(self):
self.assertTrue(users_after.issubset(users_before))
clean_transdata()

@tier1
def test_positive_import_users_merge(self):
"""Try to Merge users with the same name using 'merge-users'
option.
Expand Down Expand Up @@ -762,7 +754,6 @@ def test_positive_import_users_merge(self):
self.assertNotEqual(User.info({'id': record['sat6']}), '')
clean_transdata()

@tier1
def test_positive_import_users_recovery(self):
"""Try to Import users with the same name to invoke
usage of a recovery strategy (rename, map, none)
Expand Down Expand Up @@ -824,7 +815,6 @@ def test_positive_import_users_recovery(self):
ssh.command(u'rm -rf {0}'.format(' '.join(pwdfiles)))
clean_transdata()

@tier1
def test_positive_import_host_collections_default(self):
"""Import all System Groups from the default data set
(predefined source) as the Host Collections.
Expand Down Expand Up @@ -860,7 +850,6 @@ def test_positive_import_host_collections_default(self):
)
clean_transdata()

@tier1
def test_negative_reimport_host_collections_default(self):
"""Try to re-import all System Groups from the default data set
(predefined source) as the Host Collections.
Expand Down Expand Up @@ -893,7 +882,6 @@ def test_negative_reimport_host_collections_default(self):
self.assertEqual(hcollections_before, hcollections_after)
clean_transdata()

@tier1
def test_positive_import_host_collections_recovery(self):
"""Try to Import Collections with the same name to invoke
usage of a recovery strategy (rename, map, none)
Expand Down Expand Up @@ -956,7 +944,6 @@ def test_positive_import_host_collections_recovery(self):
HostCollection.info({'id': record['sat6']})
clean_transdata()

@tier1
def test_positive_import_repo_default(self):
"""Import and enable all Repositories from the default data set
(predefined source)
Expand Down Expand Up @@ -995,7 +982,6 @@ def test_positive_import_repo_default(self):
)
clean_transdata()

@tier1
def test_negative_reimport_repo(self):
"""Import and enable all Repositories from the default data set
(predefined source), then try to Import Repositories from the same CSV
Expand Down Expand Up @@ -1046,7 +1032,6 @@ def test_negative_reimport_repo(self):
)
clean_transdata()

@tier1
def test_positive_import_repo_recovery(self):
"""Try to Import Repos with the same name to invoke
usage of a recovery strategy (rename, map, none)
Expand Down Expand Up @@ -1109,7 +1094,6 @@ def test_positive_import_repo_recovery(self):
Repository.info({'id': record['sat6']})
clean_transdata()

@tier1
def test_positive_import_cv_default(self):
"""Import and enable all Content Views from the default data set
(predefined source)
Expand Down Expand Up @@ -1153,7 +1137,6 @@ def test_positive_import_cv_default(self):
)
clean_transdata()

@tier1
def test_negative_reimport_cv(self):
"""Import and enable all Content Views from the default data set
(predefined source), then try to Import them from the same CSV
Expand Down Expand Up @@ -1207,7 +1190,6 @@ def test_negative_reimport_cv(self):
)
clean_transdata()

@tier1
def test_positive_import_cv_recovery(self):
"""Try to Import Content Views with the same name to invoke
usage of a recovery strategy (rename, map, none)
Expand Down Expand Up @@ -1280,7 +1262,6 @@ def test_positive_import_cv_recovery(self):
ContentView.info({'id': record['sat6']})
clean_transdata()

@tier1
def test_positive_translate_macros(self):
"""Check whether all supported Sat5 macros are being properly
converted to the Puppet facts.
Expand Down Expand Up @@ -1395,7 +1376,6 @@ def test_positive_translate_macros(self):
)
clean_transdata()

@tier1
def test_positive_import_enable_rh_repos(self):
"""Import and enable all red hat repositories from predefined
dataset
Expand Down Expand Up @@ -1444,7 +1424,6 @@ def test_positive_import_enable_rh_repos(self):
)
clean_transdata()

@tier1
def test_negative_reimport_enable_rh_repos(self):
"""Repetitive Import and enable of all red hat repositories from
the predefined dataset
Expand Down Expand Up @@ -1489,7 +1468,6 @@ def test_negative_reimport_enable_rh_repos(self):
)
clean_transdata()

@tier1
def test_positive_import_chosts_default(self):
"""Import all content hosts from
the predefined dataset
Expand Down Expand Up @@ -1519,7 +1497,6 @@ def test_positive_import_chosts_default(self):
)
clean_transdata()

@tier1
def test_negative_reimport_chosts(self):
"""Repetitive Import of all content hosts from
the predefined dataset
Expand Down Expand Up @@ -1560,7 +1537,6 @@ def test_negative_reimport_chosts(self):
clean_transdata()

@skip_if_bug_open('bugzilla', 1267224)
@tier1
def test_negative_import_chosts_recovery(self):
"""Try to invoke usage of a recovery strategy
Expand Down Expand Up @@ -1591,7 +1567,6 @@ def test_negative_import_chosts_recovery(self):
})
clean_transdata()

@tier1
def test_positive_import_snippets_default(self):
"""Import template snippets from the default data set
(predefined source)
Expand Down Expand Up @@ -1629,7 +1604,6 @@ def test_positive_import_snippets_default(self):
self.assertTrue(template[u'type'] == u'snippet')
clean_transdata()

@tier1
def test_positive_import_config_files_default(self):
"""Import all Config Files from the default data set
(predefined source)
Expand Down Expand Up @@ -1668,7 +1642,6 @@ def test_positive_import_config_files_default(self):
)
clean_transdata()

@tier1
def test_negative_reimport_config_files(self):
"""Repetitive Import of all Config Files from the default
data set (predefined source)
Expand Down Expand Up @@ -1711,7 +1684,6 @@ def test_negative_reimport_config_files(self):
self.assertEqual(cf_before, cf_after)
clean_transdata()

@tier1
def test_positive_import_ak_default(self):
"""Import AKs from the default data set
(predefined source)
Expand Down

0 comments on commit 7e12cd8

Please sign in to comment.