Skip to content

Commit 149bcb3

Browse files
author
Prasanna Santhanam
committed
adding attributes to the smoke tests
1 parent 9043e49 commit 149bcb3

13 files changed

Lines changed: 123 additions & 30 deletions

‎test/integration/smoke/test_disk_offerings.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from integration.lib.utils import *
2424
from integration.lib.base import *
2525
from integration.lib.common import *
26+
from nose.plugins.attrib import attr
2627

2728
class Services:
2829
"""Test Disk offerings Services
@@ -56,6 +57,7 @@ def tearDown(self):
5657
raise Exception("Warning: Exception during cleanup : %s" % e)
5758
return
5859

60+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
5961
def test_01_create_disk_offering(self):
6062
"""Test to create disk offering"""
6163

@@ -142,6 +144,7 @@ def tearDownClass(cls):
142144
raise Exception("Warning: Exception during cleanup : %s" % e)
143145
return
144146

147+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
145148
def test_02_edit_disk_offering(self):
146149
"""Test to update existing disk offering"""
147150

@@ -192,6 +195,7 @@ def test_02_edit_disk_offering(self):
192195
)
193196
return
194197

198+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
195199
def test_03_delete_disk_offering(self):
196200
"""Test to delete disk offering"""
197201

‎test/integration/smoke/test_hosts.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from integration.lib.utils import *
2424
from integration.lib.base import *
2525
from integration.lib.common import *
26+
from nose.plugins.attrib import attr
2627

2728
#Import System modules
2829
import time
@@ -116,6 +117,7 @@ def tearDown(self):
116117
raise Exception("Warning: Exception during cleanup : %s" % e)
117118
return
118119

120+
@unittest.skip("skipped - our environments will not add hosts")
119121
def test_01_clusters(self):
120122
"""Test Add clusters & hosts - XEN, KVM, VWARE
121123
"""

‎test/integration/smoke/test_iso.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from integration.lib.utils import *
2424
from integration.lib.base import *
2525
from integration.lib.common import *
26+
from nose.plugins.attrib import attr
2627
import urllib
2728
from random import random
2829
#Import System modules
@@ -42,7 +43,7 @@ def __init__(self):
4243
"username": "test",
4344
# Random characters are appended in create account to
4445
# ensure unique username generated each time
45-
"password": "fr3sca",
46+
"password": "password",
4647
},
4748
"iso_1":
4849
{
@@ -53,7 +54,7 @@ def __init__(self):
5354
"isextractable": True,
5455
"isfeatured": True,
5556
"ispublic": True,
56-
"ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
57+
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
5758
},
5859
"iso_2":
5960
{
@@ -64,7 +65,7 @@ def __init__(self):
6465
"isextractable": True,
6566
"isfeatured": True,
6667
"ispublic": True,
67-
"ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
68+
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
6869
"mode": 'HTTP_DOWNLOAD',
6970
# Used in Extract template, value must be HTTP_DOWNLOAD
7071
},
@@ -77,7 +78,7 @@ def __init__(self):
7778
"passwordenabled": True,
7879
"sleep": 60,
7980
"timeout": 10,
80-
"ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
81+
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
8182
# CentOS 5.3 (64 bit)
8283
"mode": 'advanced'
8384
# Networking mode: Basic or Advanced
@@ -117,6 +118,7 @@ def tearDown(self):
117118

118119
return
119120

121+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
120122
def test_01_create_iso(self):
121123
"""Test create public & private ISO
122124
"""
@@ -254,6 +256,7 @@ def tearDown(self):
254256

255257
return
256258

259+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
257260
def test_02_edit_iso(self):
258261
"""Test Edit ISO
259262
"""
@@ -318,6 +321,7 @@ def test_02_edit_iso(self):
318321
)
319322
return
320323

324+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
321325
def test_03_delete_iso(self):
322326
"""Test delete ISO
323327
"""
@@ -345,6 +349,7 @@ def test_03_delete_iso(self):
345349
)
346350
return
347351

352+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
348353
def test_04_extract_Iso(self):
349354
"Test for extract ISO"
350355

@@ -395,6 +400,7 @@ def test_04_extract_Iso(self):
395400
)
396401
return
397402

403+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
398404
def test_05_iso_permissions(self):
399405
"""Update & Test for ISO permissions"""
400406

@@ -446,6 +452,7 @@ def test_05_iso_permissions(self):
446452
)
447453
return
448454

455+
@attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke", "multizone"])
449456
def test_06_copy_iso(self):
450457
"""Test for copy ISO from one zone to another"""
451458

‎test/integration/smoke/test_network.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from integration.lib.utils import *
2525
from integration.lib.base import *
2626
from integration.lib.common import *
27+
from nose.plugins.attrib import attr
2728
#Import System modules
2829
import time
2930

@@ -34,7 +35,7 @@ class Services:
3435

3536
def __init__(self):
3637
self.services = {
37-
"ostypeid": '1a568aed-db2d-41ca-b644-416b0bdc067e',
38+
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
3839
# Cent OS 5.3 (64 bit)
3940
"mode": 'advanced',
4041
# Networking mode: Basic or advanced
@@ -186,6 +187,7 @@ def tearDownClass(cls):
186187
raise Exception("Warning: Exception during cleanup : %s" % e)
187188
return
188189

190+
@attr(tags = ["advanced", "advancedns", "smoke"])
189191
def test_public_ip_admin_account(self):
190192
"""Test for Associate/Disassociate
191193
public IP address for admin account"""
@@ -236,6 +238,7 @@ def test_public_ip_admin_account(self):
236238
)
237239
return
238240

241+
@attr(tags = ["advanced", "advancedns", "smoke"])
239242
def test_public_ip_user_account(self):
240243
"""Test for Associate/Disassociate
241244
public IP address for user account"""
@@ -346,6 +349,7 @@ def tearDown(self):
346349
cleanup_resources(self.apiclient, self.cleanup)
347350
return
348351

352+
@attr(tags = ["advanced", "advancedns", "smoke"])
349353
def test_01_port_fwd_on_src_nat(self):
350354
"""Test for port forwarding on source NAT"""
351355

@@ -468,6 +472,7 @@ def test_01_port_fwd_on_src_nat(self):
468472
)
469473
return
470474

475+
@attr(tags = ["advanced", "advancedns", "smoke"])
471476
def test_02_port_fwd_on_non_src_nat(self):
472477
"""Test for port forwarding on non source NAT"""
473478

@@ -664,6 +669,7 @@ def tearDownClass(cls):
664669
cleanup_resources(cls.api_client, cls._cleanup)
665670
return
666671

672+
@attr(tags = ["advanced", "advancedns", "smoke"])
667673
def test_01_create_lb_rule_src_nat(self):
668674
"""Test to create Load balancing rule with source NAT"""
669675

@@ -871,6 +877,7 @@ def test_01_create_lb_rule_src_nat(self):
871877
ssh_1.execute("hostname")[0]
872878
return
873879

880+
@attr(tags = ["advanced", "advancedns", "smoke"])
874881
def test_02_create_lb_rule_non_nat(self):
875882
"""Test to create Load balancing rule with source NAT"""
876883

@@ -1141,6 +1148,7 @@ def setUp(self):
11411148
]
11421149
return
11431150

1151+
@attr(tags = ["advanced", "advancedns", "smoke"])
11441152
def test_reboot_router(self):
11451153
"""Test for reboot router"""
11461154

@@ -1276,6 +1284,7 @@ def setUp(self):
12761284
]
12771285
return
12781286

1287+
@attr(tags = ["advanced", "advancedns", "smoke"])
12791288
def test_assign_and_removal_lb(self):
12801289
"""Test for assign & removing load balancing rule"""
12811290

@@ -1550,6 +1559,7 @@ def setUp(self):
15501559
def tearDown(self):
15511560
cleanup_resources(self.apiclient, self.cleanup)
15521561

1562+
@attr(tags = ["advanced", "advancedns", "smoke"])
15531563
def test_releaseIP(self):
15541564
"""Test for Associate/Disassociate public IP address"""
15551565

@@ -1678,6 +1688,7 @@ def setUp(self):
16781688
self.cleanup = []
16791689
return
16801690

1691+
@attr(tags = ["advanced", "advancedns", "smoke"])
16811692
def test_delete_account(self):
16821693
"""Test for delete account"""
16831694

‎test/integration/smoke/test_primary_storage.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from marvin.cloudstackAPI import *
2323
from integration.lib.utils import *
2424
from integration.lib.base import *
25+
from nose.plugins.attrib import attr
2526
from integration.lib.common import *
2627

2728
#Import System modules
@@ -83,6 +84,7 @@ def tearDown(self):
8384
raise Exception("Warning: Exception during cleanup : %s" % e)
8485
return
8586

87+
@unittest.skip("skipped - will not be adding storage in our environments")
8688
def test_01_primary_storage(self):
8789
"""Test primary storage pools - XEN, KVM, VMWare
8890
"""

‎test/integration/smoke/test_routers.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from integration.lib.utils import *
2525
from integration.lib.base import *
2626
from integration.lib.common import *
27+
from nose.plugins.attrib import attr
2728
#Import System modules
2829
import time
2930

@@ -59,7 +60,7 @@ def __init__(self):
5960
"username": "testuser",
6061
"password": "password",
6162
},
62-
"ostypeid":'1a568aed-db2d-41ca-b644-416b0bdc067e',
63+
"ostypeid":'01853327-513e-4508-9628-f1f55db1946f',
6364
"sleep": 60,
6465
"timeout": 10,
6566
"mode": 'advanced', #Networking mode: Basic, Advanced
@@ -129,6 +130,7 @@ def setUp(self):
129130
self.apiclient = self.testClient.getApiClient()
130131
return
131132

133+
@attr(tags = ["advanced", "basic", "sg", "smoke"])
132134
def test_01_router_internal_basic(self):
133135
"""Test router internal basic zone
134136
"""
@@ -190,6 +192,7 @@ def test_01_router_internal_basic(self):
190192
)
191193
return
192194

195+
@attr(tags = ["advanced", "smoke"])
193196
def test_02_router_internal_adv(self):
194197
"""Test router internal advanced zone
195198
"""
@@ -267,6 +270,7 @@ def test_02_router_internal_adv(self):
267270
self.debug("Haproxy process status: %s" % res)
268271
return
269272

273+
@attr(tags = ["advanced", "advancedns", "smoke"])
270274
def test_03_restart_network_cleanup(self):
271275
"""Test restart network
272276
"""
@@ -344,6 +348,7 @@ def test_03_restart_network_cleanup(self):
344348
)
345349
return
346350

351+
@attr(tags = ["advanced", "advancedns", "smoke"])
347352
def test_04_restart_network_wo_cleanup(self):
348353
"""Test restart network without cleanup
349354
"""
@@ -444,6 +449,7 @@ def test_04_restart_network_wo_cleanup(self):
444449
)
445450
return
446451

452+
@attr(tags = ["advanced", "advancedns", "smoke"])
447453
def test_05_router_basic(self):
448454
"""Test router basic setup
449455
"""
@@ -509,6 +515,7 @@ def test_05_router_basic(self):
509515
)
510516
return
511517

518+
@attr(tags = ["advanced", "advancedns", "smoke"])
512519
def test_06_router_advanced(self):
513520
"""Test router advanced setup
514521
"""
@@ -591,6 +598,7 @@ def test_06_router_advanced(self):
591598
)
592599
return
593600

601+
@attr(tags = ["advanced", "advancedns", "smoke"])
594602
def test_07_stop_router(self):
595603
"""Test stop router
596604
"""
@@ -634,6 +642,7 @@ def test_07_stop_router(self):
634642
)
635643
return
636644

645+
@attr(tags = ["advanced", "advancedns", "smoke"])
637646
def test_08_start_router(self):
638647
"""Test start router
639648
"""
@@ -678,6 +687,7 @@ def test_08_start_router(self):
678687
)
679688
return
680689

690+
@attr(tags = ["advanced", "advancedns", "smoke"])
681691
def test_09_reboot_router(self):
682692
"""Test reboot router
683693
"""
@@ -730,6 +740,8 @@ def test_09_reboot_router(self):
730740
)
731741
return
732742

743+
@attr(configuration = "network.gc")
744+
@attr(tags = ["advanced", "advancedns", "smoke"])
733745
def test_10_network_gc(self):
734746
"""Test network GC
735747
"""

‎test/integration/smoke/test_secondary_storage.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from integration.lib.utils import *
2424
from integration.lib.base import *
2525
from integration.lib.common import *
26+
from nose.plugins.attrib import attr
2627

2728
#Import System modules
2829
import time
@@ -84,7 +85,7 @@ def tearDown(self):
8485
raise Exception("Warning: Exception during cleanup : %s" % e)
8586
return
8687

87-
@unittest.skip("do not add secondary storage")
88+
@unittest.skip("skipped - do not add secondary storage")
8889
def test_01_add_sec_storage(self):
8990
"""Test secondary storage
9091
"""
@@ -138,6 +139,7 @@ def test_01_add_sec_storage(self):
138139
)
139140
return
140141

142+
@attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
141143
def test_02_sys_vm_start(self):
142144
"""Test system VM start
143145
"""
@@ -268,6 +270,7 @@ def test_02_sys_vm_start(self):
268270
)
269271
return
270272

273+
@attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
271274
def test_03_sys_template_ready(self):
272275
"""Test system templates are ready
273276
"""

0 commit comments

Comments
 (0)